Merge branch 'master' into new-design-notifications-news

podkrepi-bg · Dec 14, 2023 · e4d87c8 · e4d87c8
2 parents a17dab3 + 740fd9e
commit e4d87c8
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 64 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -89,34 +89,34 @@ jobs:
         with:
           image: ghcr.io/podkrepi-bg/frontend:${{ env.VERSION }}
 
-  scan-manifests:
-    name: Scan k8s manifests
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install kustomize
-        uses: imranismail/setup-kustomize@v2
-
-      - name: Build development manifests
-        run: kustomize build manifests/overlays/development > dev-manifests.yaml
-
-      - name: Scan development manifests with Mondoo
-        uses: mondoohq/actions/k8s-manifest@main
-        env:
-          MONDOO_CONFIG_BASE64: ${{ secrets.MONDOO_SECRET }}
-        with:
-          path: dev-manifests.yaml
-
-      - name: Build production manifests
-        run: kustomize build manifests/overlays/production > prod-manifests.yaml
-
-      - name: Scan production manifests with Mondoo
-        uses: mondoohq/actions/k8s-manifest@main
-        env:
-          MONDOO_CONFIG_BASE64: ${{ secrets.MONDOO_SECRET }}
-        with:
-          path: prod-manifests.yaml
+#  scan-manifests:
+#    name: Scan k8s manifests
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v4
+#
+#      - name: Install kustomize
+#        uses: imranismail/setup-kustomize@v2
+#
+#      - name: Build development manifests
+#        run: kustomize build manifests/overlays/development > dev-manifests.yaml
+#
+#      - name: Scan development manifests with Mondoo
+#        uses: mondoohq/actions/k8s-manifest@main
+#        env:
+#          MONDOO_CONFIG_BASE64: ${{ secrets.MONDOO_SECRET }}
+#        with:
+#          path: dev-manifests.yaml
+#
+#      - name: Build production manifests
+#        run: kustomize build manifests/overlays/production > prod-manifests.yaml
+#
+#      - name: Scan production manifests with Mondoo
+#        uses: mondoohq/actions/k8s-manifest@main
+#        env:
+#          MONDOO_CONFIG_BASE64: ${{ secrets.MONDOO_SECRET }}
+#        with:
+#          path: prod-manifests.yaml
 
   run-playwright:
     name: Run Playwright
@@ -126,7 +126,7 @@ jobs:
   release-dev:
     name: Release to dev
     runs-on: ubuntu-latest
-    needs: [build-frontend-image, build-maintenance-image, scan-manifests, run-playwright]
+    needs: [build-frontend-image, build-maintenance-image, run-playwright]
     environment:
       name: dev
       url: https://dev.podkrepi.bg

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -71,36 +71,36 @@ jobs:
         with:
           image: ghcr.io/podkrepi-bg/maintenance:pr
 
-  scan-manifests:
-    name: Scan k8s manifests
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-
-      - name: Install kustomize
-        uses: imranismail/setup-kustomize@v2
-
-      - name: Build development manifests
-        run: kustomize build manifests/overlays/development > dev-manifests.yaml
-
-      - name: Scan development manifests with Mondoo
-        uses: mondoohq/actions/k8s-manifest@main
-        env:
-          MONDOO_CONFIG_BASE64: ${{ secrets.MONDOO_SECRET }}
-        with:
-          path: dev-manifests.yaml
-
-      - name: Build production manifests
-        run: kustomize build manifests/overlays/production > prod-manifests.yaml
-
-      - name: Scan production manifests with Mondoo
-        uses: mondoohq/actions/k8s-manifest@main
-        env:
-          MONDOO_CONFIG_BASE64: ${{ secrets.MONDOO_SECRET }}
-        with:
-          path: prod-manifests.yaml
+#  scan-manifests:
+#    name: Scan k8s manifests
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v4
+#        with:
+#          ref: ${{ github.event.pull_request.head.sha }}
+#
+#      - name: Install kustomize
+#        uses: imranismail/setup-kustomize@v2
+#
+#      - name: Build development manifests
+#        run: kustomize build manifests/overlays/development > dev-manifests.yaml
+#
+#      - name: Scan development manifests with Mondoo
+#        uses: mondoohq/actions/k8s-manifest@main
+#        env:
+#          MONDOO_CONFIG_BASE64: ${{ secrets.MONDOO_SECRET }}
+#        with:
+#          path: dev-manifests.yaml
+#
+#      - name: Build production manifests
+#        run: kustomize build manifests/overlays/production > prod-manifests.yaml
+#
+#      - name: Scan production manifests with Mondoo
+#        uses: mondoohq/actions/k8s-manifest@main
+#        env:
+#          MONDOO_CONFIG_BASE64: ${{ secrets.MONDOO_SECRET }}
+#        with:
+#          path: prod-manifests.yaml
 
   run-playwright:
     name: Run Playwright

diff --git a/src/components/client/campaigns/CampaignCard/CampaignCard.tsx b/src/components/client/campaigns/CampaignCard/CampaignCard.tsx
@@ -40,7 +40,7 @@ export default function ActiveCampaignCard({ campaign, index }: Props) {
 
   const campaignImagesUrl = campaignListPictureUrl(campaign)
 
-  const reached = summary ? summary.reachedAmount + summary.guaranteedAmount : 0
+  const reached = summary ? summary.reachedAmount + (summary.guaranteedAmount ?? 0) : 0
   const reachedAmount = moneyPublic(reached)
   const targetAmount = moneyPublic(campaign.targetAmount)
   const percentage = (reached / target) * 100

diff --git a/src/components/client/campaigns/CampaignDetails.tsx b/src/components/client/campaigns/CampaignDetails.tsx
@@ -227,7 +227,7 @@ type CampaignFinanceProps = Props & {
   expenses: number
 }
 const CampaignFinanceSummary = ({ campaign, expenses }: CampaignFinanceProps) => {
-  const total = campaign.summary.guaranteedAmount + campaign.summary.reachedAmount
+  const total = (campaign.summary.guaranteedAmount ?? 0) + campaign.summary.reachedAmount
   const transferred = campaign.summary.blockedAmount + campaign.summary.withdrawnAmount
   return (
     <StyledGrid item>
@@ -243,7 +243,7 @@ const CampaignFinanceSummary = ({ campaign, expenses }: CampaignFinanceProps) =>
         </Tooltip>
       </Typography>
       <Typography className={classes.financeSummary}>
-        Гарантирани: {moneyPublic(campaign.summary.guaranteedAmount)}
+        Гарантирани: {moneyPublic(campaign.summary.guaranteedAmount ?? 0)}
         <Tooltip
           enterTouchDelay={0}
           title={

diff --git a/src/components/client/campaigns/InlineDonation.tsx b/src/components/client/campaigns/InlineDonation.tsx
@@ -265,7 +265,7 @@ export default function InlineDonation({ campaign }: Props) {
     state: campaignState,
     slug: campaignSlug,
   } = campaign
-  const reached = summary ? summary.reachedAmount + summary.guaranteedAmount : 0
+  const reached = summary ? summary.reachedAmount + (summary.guaranteedAmount ?? 0) : 0
   const reachedAmount = moneyPublic(reached)
   const targetAmount = moneyPublic(campaign.targetAmount)
   const donors = summary?.donors ?? 0

diff --git a/...ts/client/index/sections/ActiveCampaignsSection/ActiveCampaignCard/ActiveCampaignCard.tsx b/...ts/client/index/sections/ActiveCampaignsSection/ActiveCampaignCard/ActiveCampaignCard.tsx
@@ -29,7 +29,7 @@ export default function ActiveCampaignCard({ campaign, index }: Props) {
   const { id, slug, title, summary, targetAmount: target } = campaign
   const campaignImagesUrl = campaignListPictureUrl(campaign)
 
-  const reached = summary ? summary.reachedAmount + campaign.summary.guaranteedAmount : 0
+  const reached = summary ? summary.reachedAmount + (summary.guaranteedAmount ?? 0) : 0
 
   const reachedAmount = moneyPublic(reached)
   const targetAmount = moneyPublic(campaign.targetAmount)