Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,9 @@ jobs:
env:
# Build-time envs used in next.config.js
NET: 'sepolia'
INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }}
ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
INFURA_API_KEY: ${{ secrets.DEV_INFURA_API_KEY }}
ALCHEMY_API_KEY: ${{ secrets.DEV_ALCHEMY_API_KEY }}
GA4_TAG_ID: ${{ secrets.GA4_TAG_ID }}
WOGAA_ENV: ${{ secrets.WOGAA_ENV }}
TRUSTED_TLDS: ${{ secrets.TRUSTED_TLDS }}

- name: Upload build artifact (Dev)
Expand All @@ -74,8 +73,8 @@ jobs:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-access-key-id: ${{ secrets.DEV_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ secrets.AWS_REGION }}

- name: Select target bucket
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ jobs:
INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }}
ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
GA4_TAG_ID: ${{ secrets.GA4_TAG_ID }}
WOGAA_ENV: ${{ secrets.WOGAA_ENV }}
TRUSTED_TLDS: ${{ secrets.TRUSTED_TLDS }}

- name: Upload build artifact
Expand Down
1 change: 0 additions & 1 deletion next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ const nextConfig = {
ALCHEMY_API_KEY: process.env.ALCHEMY_API_KEY, // The default/free key should not be used in production as they are rate-limited by the service provider
TRUSTED_TLDS: process.env.TRUSTED_TLDS || "gov.sg,edu.sg",
GA4_TAG_ID: process.env.GA4_TAG_ID || "G-JP12T2F01V",
WOGAA_ENV: process.env.WOGAA_ENV || "production",
},
// Variables passed to both server and client
publicRuntimeConfig: {
Expand Down
4 changes: 1 addition & 3 deletions pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { ParsedUrlQuery } from "querystring";
import { useRouter } from "next/router";
import React, { useEffect, useState } from "react";
import { connect } from "react-redux";
import { Wogaa } from "../src/components/Analytics/wogaa";
import { Wrapper, Main } from "../src/components/Layout/Body";
import { FooterBar } from "../src/components/Layout/FooterBar";
import { NavigationBar } from "../src/components/Layout/NavigationBar";
Expand Down Expand Up @@ -38,8 +37,7 @@ const HomePage: React.FunctionComponent<HomePageProps> = (props) => {
}, [props, urlParams]);

return (
<Wrapper isLoadWogaa={false}>
{urlParams ? <Wogaa /> : null}
<Wrapper>
<NavigationBar />
<Main>
<MainPageContainer />
Expand Down
73 changes: 0 additions & 73 deletions src/components/Analytics/wogaa.tsx

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {
triggerV3RendererTimeoutLogging,
triggerV4RendererTimeoutLogging,
} from "../Analytics";
import { startTransactionalService, completeTransactionalService } from "../Analytics/wogaa";
import { MutiTabsContainer } from "../MultiTabs";

interface DecentralisedRendererProps {
Expand Down Expand Up @@ -164,11 +163,6 @@ const DecentralisedRenderer: React.FunctionComponent<DecentralisedRendererProps>

// CERTIFICATE_DETAILS event
sendEventCertificateDetails("CERTIFICATE_DETAILS", rawDocument);

// Wogaa Transaction Service: Successful Verification on OpenCerts
// TODO: Separate transaction service according to document version? (e.g. 2.0, 3.0, 4.0)
startTransactionalService("opencertsio-5538");
completeTransactionalService("opencertsio-5538");
}, [rawDocument]);

const visibleTemplates = templates.filter((template) => template.id !== "print");
Expand Down
11 changes: 2 additions & 9 deletions src/components/Layout/Body.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
import React from "react";
import { Wogaa } from "../Analytics/wogaa";

interface WrapperProps {
children: React.ReactNode;
isLoadWogaa?: boolean;
}

export const Wrapper: React.FunctionComponent<WrapperProps> = ({ children, isLoadWogaa = true }) => {
return (
<>
{isLoadWogaa ? <Wogaa /> : null}
<div className="flex flex-col h-screen wrapper">{children}</div>
</>
);
export const Wrapper: React.FunctionComponent<WrapperProps> = ({ children }) => {
return <div className="flex flex-col h-screen wrapper">{children}</div>;
};

interface MainProps {
Expand Down
7 changes: 0 additions & 7 deletions src/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@ export const NETWORK_NAME = SUPPORTED_NETWORK[0]; // expected by ethers
export const GA4_TAG_ID = process.env.GA4_TAG_ID;
export const CAPTCHA_CLIENT_KEY = "6LfVb9UrAAAAAGH_L1N5U6plJ0uhgB_KnDUFaooh";

/**
* Tracking ID(s) for Wogaa Transactional Service
*/
export const WOGAA_TRANSACTIONAL_SERVICE = {
successfulVerification: "opencertsio-5538",
} as const;

const getApiUrl = (networkName: string): string => {
if (networkName === "homestead") return API_MAIN_URL;
return API_DEV_URL;
Expand Down