qa for deployer bug

.cspell.json

@@ -5,6 +5,7 @@
   "useGitignore": true,
   "language": "en",
   "words": [
+    "adblocker",
     "binkey",
     "binsec",
     "blockscan",
@@ -15,6 +16,8 @@
     "devpool",
     "ethersproject",
     "fract",
+    "giftcards",
+    "gnosischain",
     "funder",
     "Funder",
     "gnosisscan",
@@ -29,9 +32,13 @@
     "Numberish",
     "outdir",
     "outfile",
+    "pageable",
+    "ress",
+    "Reloadly",
     "Rpcs",
     "scalarmult",
     "servedir",
+    "skus",
     "solmate",
     "sonarjs",
     "SUPABASE",

.github/knip.ts

@@ -1,8 +1,8 @@
 import type { KnipConfig } from "knip";
 
 const config: KnipConfig = {
-  entry: ["build/esbuild-build.ts", "static/scripts/rewards/init.ts"],
-  project: ["src/**/*.ts", "static/scripts/**/*.ts"],
+  entry: ["build/esbuild-build.ts", "static/scripts/rewards/init.ts", "static/scripts/ubiquity-dollar/init.ts", "static/scripts/shared/api.ts"],
+  project: ["src/**/*.ts", "static/scripts/**/*.ts", "shared/**/api-types.ts"],
   ignore: ["src/types/config.ts", "**/__mocks__/**", "**/__fixtures__/**", "lib/**/*"],
   ignoreExportsUsedInFile: true,
   // eslint can also be safely ignored as per the docs: https://knip.dev/guides/handling-issues#eslint--jest

.github/workflows/build.yml

@@ -37,5 +37,7 @@ jobs:
           name: full-stack-app
           path: |
             static
+            functions
+            shared
             package.json
             yarn.lock

.github/workflows/cypress-testing.yml

@@ -38,14 +38,17 @@ jobs:
             sleep 1
           done || exit 1
 
-      - name: Fund test accounts
-        run: yarn test:fund
+      - name: Start Cloudflare Wrangler
+        run: npx wrangler pages dev static --port 8080 --binding USE_RELOADLY_SANDBOX=true RELOADLY_API_CLIENT_ID="$RELOADLY_SANDBOX_API_CLIENT_ID" RELOADLY_API_CLIENT_SECRET="$RELOADLY_SANDBOX_API_CLIENT_SECRET" &
+        env:
+          RELOADLY_SANDBOX_API_CLIENT_ID: ${{ secrets.RELOADLY_SANDBOX_API_CLIENT_ID }}
+          RELOADLY_SANDBOX_API_CLIENT_SECRET: ${{ secrets.RELOADLY_SANDBOX_API_CLIENT_SECRET }}
 
       - name: Cypress run
         uses: cypress-io/github-action@v6
         with:
           build: yarn run build
-          start: yarn start
+          start: yarn test:fund
 
         env:
           SUPABASE_URL: "https://wfzpewmlyiozupulbuur.supabase.co"

.github/workflows/deploy.yml

@@ -11,6 +11,14 @@ jobs:
     name: Automatic Cloudflare Deploy
     runs-on: ubuntu-22.04
     steps:
+      - name: Verify Runner's Identity
+        id: verify-runner
+        run: |
+          echo "Runner name: $RUNNER_NAME"
+          if [[ "$RUNNER_NAME" != *"GitHub Actions"* ]]; then
+            echo "This workflow must run on a GitHub Actions runner. (github-actions[bot])"
+            exit 1
+          fi
       - name: Deploy to Cloudflare
         if: ${{ github.event.workflow_run.conclusion == 'success' }}
         uses: ubiquity/cloudflare-deploy-action@main
@@ -84,25 +92,23 @@ jobs:
               issue_number,
             });
 
-            // Find the comment to update or create a new one if not found
-            let existingComment = comments.data.find(comment => comment.user.login === 'github-actions[bot]');
-            let body = '| Preview Deployment |\n| ------------------ |\n';
+            // Look for an existing "Preview Deployment" comment
+            let previewComment = comments.data.find(comment =>
+              comment.body.startsWith("| Preview Deployment |")
+            );
+
+            const body = `| Preview Deployment |\n| ------------------ |\n| [${sha}](${{ env.CLAIMABLE_URL }}) |\n`;
 
-            // If the comment exists, update its body
-            if (existingComment) {
-              // Check if the SHA already exists in the comment body to avoid duplicates
-              if (!existingComment.body.includes(sha)) {
-                body = existingComment.body + `| [${sha}](${{ env.CLAIMABLE_URL }}) |\n`;
-                await github.rest.issues.updateComment({
-                  owner,
-                  repo,
-                  comment_id: existingComment.id,
-                  body
-                });
-              }
+            if (previewComment) {
+              // Update the existing "Preview Deployment" comment
+              await github.rest.issues.updateComment({
+                owner,
+                repo,
+                comment_id: previewComment.id,
+                body
+              });
             } else {
-              // Create a new comment if no existing comment is found
-              body += `| [${sha}](${{ env.CLAIMABLE_URL }}) |\n`;
+              // Create a new "Preview Deployment" comment if not found
               await github.rest.issues.createComment({
                 owner,
                 repo,

.github/workflows/knip-reporter.yml

@@ -11,6 +11,14 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion != 'success' }}
     steps:
+      - name: Verify Runner's Identity
+        id: verify-runner
+        run: |
+          echo "Runner name: $RUNNER_NAME"
+          if [[ "$RUNNER_NAME" != *"GitHub Actions"* ]]; then
+            echo "This workflow must run on a GitHub Actions runner. (github-actions[bot])"
+            exit 1
+          fi
       - uses: actions/download-artifact@v4
         with:
           name: knip-results
@@ -24,11 +32,39 @@ jobs:
           path: ./pr-number.txt
           trim: true
 
-      - name: Report knip results to pull request
+      - name: Get or create comment ID for Knip Report
+        id: get-comment
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { owner, repo } = context.repo;
+            const issue_number = ${{ steps.pr-number.outputs.content }};
+
+            // Fetch all comments on the PR
+            const comments = await github.rest.issues.listComments({
+              owner,
+              repo,
+              issue_number,
+            });
+
+            // Look for an existing Knip report comment
+            let knipComment = comments.data.find(comment =>
+              comment.body.startsWith("| Knip Report |")
+            );
+
+            if (knipComment) {
+              console.log('Found existing Knip report comment:', knipComment.id);
+              core.setOutput('comment_id', knipComment.id); // Set the comment ID output
+            } else {
+              console.log('No existing Knip report comment found.');
+              core.setOutput('comment_id', ''); // No existing comment
+            }
+
+      - name: Report Knip results to pull request
         uses: gitcoindev/knip-reporter@main
         with:
           verbose: true
-          comment_id: ${{ github.workflow }}-reporter
+          comment_id: ${{ steps.get-comment.outputs.comment_id || github.workflow }}-knip-report
           command_script_name: knip-ci
           annotations: true
           ignore_results: false

.gitignore

@@ -16,5 +16,6 @@ static/bundles
 
 cypress/screenshots
 cypress/videos
+.wrangler
 coverage
 junit.xml

README.md

@@ -23,23 +23,39 @@ A vanilla Typescript dApp for claiming Ubiquity Rewards. It also includes tools
   SUPABASE_ANON_KEY="...." # used for storing permit tx data
 
   # Variables depending on spender (bounty hunter)
-  AMOUNT_IN_ETH="1"
+  AMOUNT_IN_ETH="50"
   BENEFICIARY_ADDRESS="0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
 
   # Legacy env vars (only used when invalidating **REAL** permits via /scripts/solidity/getInvalidateNonceParams.ts)
   NONCE="0"
   NONCE_SIGNER_ADDRESS="0x"
   ```
 
+3. Update values for wrangler variables to use Reloadly sandbox or production API in the `wrangler.toml` file.
+
+```
+[vars]
+USE_RELOADLY_SANDBOX = "true"
+RELOADLY_API_CLIENT_ID = "xxxxxxxxxxxxxxxxxx"
+RELOADLY_API_CLIENT_SECRET = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+```
+
 ## Local Testing
 
 1. Set `.env` variables.
-2. Run `yarn test:anvil` in terminal A and `yarn test:fund` in terminal B.
-3. In terminal B, run `yarn start`.
+2. Run `yarn`
+3. Run `yarn test:anvil` in terminal A and `yarn test:fund` in terminal B.
+4. In terminal B, run
+
+```
+yarn build
+yarn start
+```
+
 4. A permit URL for both ERC20 and ERC721 will be generated.
 5. Open the generated permit URL from the console.
 6. Connect your wallet (import anvil accounts [0] & [1] into your wallet).
-7. Depending on your connected account, either the claim or invalidate button will be visible.
+7. Depending on your connected account, either the claim or invalidate button will be visible. The virtual card section will also display an available virtual card.
 8. To test ERC721 permits, deploy the `nft-rewards` contract from the [repository](https://github.com/ubiquity/nft-rewards).
 
 ### Importing Anvil Accounts
@@ -80,6 +96,19 @@ A vanilla Typescript dApp for claiming Ubiquity Rewards. It also includes tools
 - Ensure `.env` is correctly configured and wallet provider network is correct if `Allowance` or `Balance` is `0.00`.
 - Always start the Anvil instance before using `yarn start` as permit generation requires an on-chain call to `token.decimals()`.
 
+### Troubleshooting virtual cards
+
+Virtual cards are subject to regulations and are not available for all countries. Moreover, each virtual card is available for specific amounts. If you are unable to see an available virtual card it is either because of your location or the amount of your permit.
+
+If you are not getting an available card, you can perform a few extra steps to get a virtual card for testing purposes. You can set the permit amount `AMOUNT_IN_ETH` to be 50 WXDAI in the `.env` file and mock your location as United States. To set your location to United States, you can follow one of the steps given below:
+
+- Use a USA VPN
+- Set your timezone to `Eastern Time (ET) New York` and block the ajax request to `https://ipinfo.io/json` so that your timezone is used to detect your location.
+
+One of these steps should get you a virtual card to try both on Reloadly sandbox and production. Please note that if you are minting a virtual card with a mock location on Reloadly production, you will get a redeem code but you may not able to use the card due to restrictions on the card, and there is no refund or replacement. Use your real location if you want to use the virtual card.
+
+If you are using mainnet with your local environments, you may want to change the `giftCardTreasuryAddress` to a wallet that you own in the file `shared/constants.ts`. It is the wallet where payments for the virtual cards are sent.
+
 ## How to generate a permit2 URL using the script
 
 1. Admin sets `env.AMOUNT_IN_ETH` and `env.BENEFICIARY_ADDRESS` depending on a bounty hunter's reward and address

build/esbuild-build.ts

@@ -9,14 +9,16 @@ const cssFiles: string[] = [
   "static/styles/rewards/background.css",
   "static/styles/toast.css",
   "static/styles/rewards/claim-table.css",
+  "static/styles/rewards/gift-cards.css",
+  "static/styles/rewards/ubiquity-dollar.css",
   "static/styles/rewards/media-queries.css",
   "static/styles/rewards/light-mode.css",
 ];
 
 // Output bundles file
-const outputFilePath = "static/bundles/bundles.css";
+const outputFilePath = "static/out/bundles.css";
 
-const typescriptEntries = ["static/scripts/rewards/init.ts"];
+const typescriptEntries = ["static/scripts/rewards/init.ts", "static/scripts/ubiquity-dollar/init.ts"];
 export const entries = [...typescriptEntries];
 
 export const esBuildContext: esbuild.BuildOptions = {
@@ -32,8 +34,8 @@ export const esBuildContext: esbuild.BuildOptions = {
     ".ttf": "dataurl",
     ".svg": "dataurl",
   },
-  outfile: "static/bundles/bundles.js",
-  entryNames: "bundles", // Ensure the CSS is named bundles.css
+  outdir: "static/out",
+  entryNames: "[dir]", // Ensure the CSS is named bundles.css
   define: createEnvDefines(["SUPABASE_URL", "SUPABASE_ANON_KEY"], {
     commitHash: execSync(`git rev-parse --short HEAD`).toString().trim(),
   }),

cypress.config.ts

@@ -7,6 +7,9 @@ export default defineConfig({
     },
     baseUrl: "http://localhost:8080",
     experimentalStudio: true,
+    env: {
+      permitConfig: { ...process.env },
+    },
   },
   viewportHeight: 900,
   viewportWidth: 1440,