Merge pull request #45 from ProteGO-Safe/release/4.9.1

Release/4.9.1

Author: qLb

.github/workflows/locale_pr.yml

@@ -4,10 +4,10 @@ name: Manaul trigger with locales PR
 on:
   workflow_dispatch:
       inputs:
-      SYNC_TERMS:
-        description: 'Remove unused labels'     
-        required: false
-        default: 'false'
+        SYNC_TERMS:
+          description: 'Remove unused labels'     
+          required: false
+          default: 'false'
 
 jobs:
 
@@ -37,13 +37,11 @@ jobs:
             echo "CURRENT_DATE=$(date +'%Y-%m-%d_%H:%M')" >> $GITHUB_ENV
             echo "SYNC_TERMS=${{ github.event.inputs.SYNC_TERMS }}" >> $GITHUB_ENV
         shell: bash
-      
-  POE_CHECK_UPDATE:
+  
+  POE_SYNC_TERMS:
     runs-on: ubuntu-latest
     needs: [Setup]
-    if: needs.Setup.outputs.ENVIRONMENT == 'DEV'
-    outputs: 
-      UPGRADE: ${{ env.UPGRADE }}
+    if: needs.Setup.outputs.ENVIRONMENT == 'DEV' && needs.Setup.outputs.SYNC_TERMS == 'true'
     env:
       COMMIT_TO: ${{ needs.Setup.outputs.COMMIT_TO }}
       TEMP_BRANCH: ${{ needs.Setup.outputs.TEMP_BRANCH }}
@@ -56,8 +54,23 @@ jobs:
 
       - name: Sync terms from PL file
         run: |
-          sh  locales/scripts/sync_terms.sh  -i ${{ secrets.POEDITOR_ID }} -t ${{ secrets.POEDITOR_TOKEN }} -o locales
-        if: env.SYNC_TERMS == 'true'
+          sh locales/scripts/sync_terms.sh -i ${{ secrets.POEDITOR_ID }} -t ${{ secrets.POEDITOR_TOKEN }} -o locales
+
+  POE_CHECK_UPDATE:
+    runs-on: ubuntu-latest
+    needs: [Setup]
+    if: needs.Setup.outputs.ENVIRONMENT == 'DEV' && needs.Setup.outputs.SYNC_TERMS == 'false'
+    outputs: 
+      UPGRADE: ${{ env.UPGRADE }}
+    env:
+      COMMIT_TO: ${{ needs.Setup.outputs.COMMIT_TO }}
+      TEMP_BRANCH: ${{ needs.Setup.outputs.TEMP_BRANCH }}
+      SYNC_TERMS: ${{ needs.Setup.outputs.SYNC_TERMS }}
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ env.COMMIT_TO }}
 
       - name: Download REMOTE LOCALES from POEditor
         run: |
@@ -66,6 +79,7 @@ jobs:
             echo "Processing $l"
             mv locales/$l.json /tmp/
           	sh  locales/scripts/export.sh  -i ${{ secrets.POEDITOR_ID }} -t ${{ secrets.POEDITOR_TOKEN }} -l $l
+            python3 locales/scripts/format_checker.py $l
             if ! diff -q locales/$l.json /tmp/$l.json 2>/dev/null
             then 
               echo "UPGRADE=true" >> $GITHUB_ENV
@@ -91,7 +105,7 @@ jobs:
   POE_MAKE_PR:
     runs-on: ubuntu-latest
     needs: [Setup,POE_CHECK_UPDATE]
-    if: needs.Setup.outputs.ENVIRONMENT == 'DEV' &&  needs.POE_CHECK_UPDATE.outputs.UPGRADE == 'true'
+    if: needs.Setup.outputs.ENVIRONMENT == 'DEV' && needs.Setup.outputs.SYNC_TERMS == 'false' && needs.POE_CHECK_UPDATE.outputs.UPGRADE == 'true'
     env:
       COMMIT_TO: ${{ needs.Setup.outputs.COMMIT_TO }}
       TEMP_BRANCH: ${{ needs.Setup.outputs.TEMP_BRANCH }}

.github/workflows/nodejs.yml

@@ -24,15 +24,15 @@ jobs:
             && github.event_name == 'push'
         run: |
           echo "ENVIRONMENT=DEV" >> $GITHUB_ENV
-          
+
       - name: Set env to STAGE
         if: startsWith(github.ref, 'refs/tags/')
             && github.repository_owner != 'ProteGO-Safe'
             && ( github.event.release.target_commitish == 'master' || startsWith( github.event.release.target_commitish, 'release' ))
             && github.event_name == 'release'
         run: |
           echo "ENVIRONMENT=STAGE" >> $GITHUB_ENV
-          
+
       - name: Set env to PROD
         if: startsWith(github.ref, 'refs/tags/')
             && github.repository_owner == 'ProteGO-Safe'
@@ -61,7 +61,7 @@ jobs:
             ${{ runner.os }}-yarn-
       - run: yarn install
       - run: yarn test
-        
+
   Build:
     runs-on: ubuntu-latest
     needs: [Setup]
@@ -78,7 +78,7 @@ jobs:
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
-        
+
       - uses: actions/cache@v2
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
@@ -92,15 +92,15 @@ jobs:
         env:
           EV: "${{ env.ENVIRONMENT }}_ENV"
         if: ${{ needs.Setup.outputs.ENVIRONMENT }}
-        
+
       - name: Upload PL locale to the POEditor
         run: |
           sh  locales/scripts/upload.sh -l pl -i $POEDITOR_ID -t $POEDITOR_TOKEN | grep '"code":"200"' || exit 1
         if: env.ENVIRONMENT == 'DEV'
         env:
           POEDITOR_ID: ${{ secrets.POEDITOR_ID }}
           POEDITOR_TOKEN: ${{ secrets.POEDITOR_TOKEN }}
-        
+
       - name: Setu Correct curl for static assets from cdn
         run: echo "CURL_COMMAND=${{ secrets[env.CURL] }}" >> $GITHUB_ENV
         env:

.github/workflows/schedule.yml

@@ -53,7 +53,6 @@ jobs:
     outputs:
       UPGRADE: ${{ env.UPGRADE }}
     env:
-      MIN_COVER: 25
       LOCAL_LOCALE: /tmp/local
       REMOTE_LOCALE: /tmp/remote
       LATEST_BRANCH: ${{ needs.Setup.outputs.LATEST_BRANCH }}
@@ -74,7 +73,7 @@ jobs:
 
       - name: Download REMOTE from POEditor
         run: |
-          sh  locales/scripts/download_all.sh -i ${{ secrets.POEDITOR_ID }} -t ${{ secrets.POEDITOR_TOKEN }} -p ${{ env.MIN_COVER }} -o ${{ env.REMOTE_LOCALE }}
+          sh  locales/scripts/download_all.sh -i ${{ secrets.POEDITOR_ID }} -t ${{ secrets.POEDITOR_TOKEN }} -o ${{ env.REMOTE_LOCALE }}
         shell: bash
 
       - name: Diff LOCAL with REMOTE

CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+
+## 4.9.1
+
+### Added
+- vaccination statistics for Poland
+
+### Changed
+- tab "How does the application work?"
+
+## Fixed
+- error of double notification entry in notification history
+
 ## 4.9.0
 
 ### Added

doc/exampleNativeBridgeActions/102-fetch-covid-stats.js

@@ -7,6 +7,12 @@ window.bridgeDataResponse(
       totalDeaths: 2000,
       newRecovered: 200,
       totalRecovered: 14000,
+      newVaccinations: 20000,
+      totalVaccinations: 450500,
+      newVaccinationsDose1: 19000,
+      totalVaccinationsDose1: 400500,
+      newVaccinationsDose2: 1000,
+      totalVaccinationsDose2: 50000,
       updated: 123234234
     }
   }),
@@ -24,6 +30,12 @@ window.onBridgeData(
       totalDeaths: 2000,
       newRecovered: 200,
       totalRecovered: 14000,
+      newVaccinations: 20000,
+      totalVaccinations: 450500,
+      newVaccinationsDose1: 19000,
+      totalVaccinationsDose1: 400500,
+      newVaccinationsDose2: 1000,
+      totalVaccinationsDose2: 50000,
       updated: 123234234
     }
   })

doc/exampleNativeBridgeActions/11-native-state.js

@@ -0,0 +1,6 @@
+window.onBridgeData(
+  11,
+  JSON.stringify({
+    appState: 1
+  })
+);