Beta to dev #334

rndquu · 2024-10-14T09:42:19Z

This PR merges gift cards minting feature into the development branch.

Old RPC was causing issues randomly when forked with anvil

ubiquity-os-deployer · 2024-10-14T09:44:41Z

ca5fb09

68f2a44

affddbb

7ca3aa9

c8b09a8

722e7bb

84c49d8

0x4007 · 2024-10-14T11:19:04Z

I'm working on merging beta in as well at #333 but please let me know if you have an idea on how to fix the stack traces in the UI. Its not debuggable for me.

I paused on it and am continuing work on the new RPC manager.

github-actions · 2024-10-14T11:26:07Z

Preview Deployment
affddbbfc65db6ccefef7a2407f04f0e974fcc55
7ca3aa9d2015b5d81cbd75c8929ac9ed18c53e5e
c8b09a8928d249328b2d31ff1bb1cf1de5d37965

rndquu · 2024-10-14T11:58:03Z

I'm working on merging beta in as well at #333 but please let me know if you have an idea on how to fix the stack traces in the UI. Its not debuggable for me.

I paused on it and am continuing work on the new RPC manager.

I don't fully understand what you mean by "fix the stack traces". I'm getting the following console output in this branch:

rndquu · 2024-10-14T12:01:32Z

@0x4007

and am continuing work on the new RPC manager.

Can't we just use the metamask provider as a fallback option instead of our rpc-handler (if it misbehaves)?

Overall this PR can be merged, we'll keep solving issues one by one (if there're any).

I haven't tried the actual gift card claiming, but at least gift cards are displayed. I'll need to check cloudflare env variables later.

0x4007

Code mostly seems fine but two concerns:

Stack traces for debugging seem useless now that it points to compiled javascript. We need this fixed or this is not maintainable.
ubiquity-dollar.html seems like an odd name choice. What about something more specific related to the cards?

0x4007 · 2024-10-14T20:37:12Z

scripts/typescript/generate-erc20-permit-url.ts

  const tokenDecimals = await tokenContract.decimals();

  return {
    permitted: {
-      token: process.env.PAYMENT_TOKEN_ADDRESS || "",
-      amount: ethers.utils.parseUnits(amount || "", tokenDecimals),
+      token: permitConfig.PAYMENT_TOKEN_ADDRESS || "",


Empty string looks wrong

0x4007 · 2024-10-14T20:38:27Z

shared/constants.ts

+
+export const permitAllowedChainIds = [1, 5, 10, 100, 31337];
+
+export const ubiquityDollarAllowedChainIds = [1, 100, 31337];


Perhaps we should bridge to optimism soon

0x4007 · 2024-10-14T20:43:10Z

static/scripts/rewards/toaster.ts


 function createToast(meaning: keyof typeof toaster.icons, text: string, timeout: number = 5000) {
-  if (meaning != "info") buttonController.hideLoader();
+  //if (meaning != "info") buttonController.hideLoader();


Maybe these should be removed

0x4007 · 2024-10-14T20:45:05Z

static/scripts/ubiquity-dollar/transaction-history.ts

+    return;
+  }
+
+  transactionHistory.innerHTML = `


Seems like another opportunity to do that String.raw syntax and then html`

0x4007 · 2024-10-14T20:45:26Z

static/scripts/ubiquity-dollar/transaction-history.ts

+}
+
+function transactionRowHtml(transaction: Transaction) {
+  return `


String.raw here as well

0x4007 · 2024-10-15T07:25:54Z

I'm working on merging beta in as well at #333 but please let me know if you have an idea on how to fix the stack traces in the UI. Its not debuggable for me.

I paused on it and am continuing work on the new RPC manager.

I don't fully understand what you mean by "fix the stack traces". I'm getting the following console output in this branch:

I missed this comment. Your logs seem fine! Mine were not pointing to the typescript source code.

rndquu · 2024-10-15T07:27:40Z

@0x4007 Resolving code conflicts in this PR is a hell (especially when new PRs are merged regularly)

Can we merge this PR? I'll address all of the issues you stated in a separate one.

EresDev added 30 commits May 11, 2024 03:19

feat: claim permit in gift cards

90ee27f

refactor: move addresses to constants from env

5426f77

fix: compares owner address case insensitive

e0a787b

fix: deduct fee from reward amount

7a61714

fix: show unavailable range cards price correctly

abf145f

refactor: rename func to clear its effect

2aada64

fix: use correct pricing for gift card

52c0979

refactor: move pricing & duplicatre code to proper files/vars

f1d58c3

fix: offer only visa & mastercard

9ebe8f0

fix: add disclaimer below gift cards list

47e644e

docs: add info about API base url

56cba03

fix: allow only ERC20 permit to claim card

cf21902

fix: prevent large prices to take second line on cards list

f056b9d

chore: run missing yarn install from previous merge

ed6c28e

chore: handle cspell warnings by listing & fixing words

afe5f9e

refactor: replace word usage product with gift-card

84763f3

fix: check permit transfers correct erc20 token on claim gift card

8d18bba

fix: check permit token owner is correct on claim gift card

7cc3fc5

fix: validate correct token transfer on different chains

8fe9b2b

refactor: allow tests to generate permits without CLI

83b816a

fix: show price/value upto 2 decimals in title

bd17ddb

test: add tests for claiming gift cards

eff0545

fix: add date filter to retrieve old order

d12b9bb

test: ignore balance because it changes with tests

0e909ec

chore: fix spell

082f52b

fix: run wrangler in workflow for backend in tests

678ca44

fix: use reloadly sandbox by default

e28ac13

fix: log if using reloadly sandbox or not

5dee0f7

fix: change anvil RPC to fork for tests

c16253d

Old RPC was causing issues randomly when forked with anvil

fix: start wrangler in action for tests backend

530f3d1

whilefoo and others added 8 commits September 28, 2024 22:36

feat: handle multiple networks for ubiquity dollar

a0ebf5e

fix: spelling

4382035

feat: support optimism network

7030020

fix: throw error

ee89f7d

Merge pull request ubiquity#313 from whilefoo/ubiquity-dollar

31674ad

fix: show rewards page

c8f4209

fix: resolve conflicts

86e54cd

build: fix

ca5fb09

rndquu added 2 commits October 14, 2024 12:48

ci: fix cspell

ae4d8d9

ci: fix knip

68f2a44

ubiquity deleted a comment from github-actions bot Oct 14, 2024

style: fix

affddbb

style: fix fonts

7ca3aa9

rndquu marked this pull request as ready for review October 14, 2024 11:58

rndquu requested a review from Keyrxng as a code owner October 14, 2024 11:58

rndquu requested a review from 0x4007 October 14, 2024 12:01

0x4007 reviewed Oct 14, 2024

View reviewed changes

rndquu added 2 commits October 15, 2024 10:14

fix: resolve conflicts

c8b09a8

ci: fix cspell

722e7bb

rndquu marked this pull request as draft October 15, 2024 07:20

rndquu marked this pull request as ready for review October 15, 2024 07:25

0x4007 merged commit 84c49d8 into ubiquity:development Oct 15, 2024
3 checks passed

rndquu deleted the refactor/beta-to-dev branch October 16, 2024 13:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Beta to dev #334

Beta to dev #334

rndquu commented Oct 14, 2024 •

edited

Loading

ubiquity-os-deployer bot commented Oct 14, 2024 •

edited

Loading

0x4007 commented Oct 14, 2024 •

edited

Loading

github-actions bot commented Oct 14, 2024 •

edited

Loading

rndquu commented Oct 14, 2024

rndquu commented Oct 14, 2024

0x4007 left a comment

0x4007 Oct 14, 2024

0x4007 Oct 14, 2024

0x4007 Oct 14, 2024

0x4007 Oct 14, 2024

0x4007 Oct 14, 2024

0x4007 commented Oct 15, 2024

rndquu commented Oct 15, 2024


		export const permitAllowedChainIds = [1, 5, 10, 100, 31337];

		export const ubiquityDollarAllowedChainIds = [1, 100, 31337];

Beta to dev #334

Beta to dev #334

Conversation

rndquu commented Oct 14, 2024 • edited Loading

ubiquity-os-deployer bot commented Oct 14, 2024 • edited Loading

0x4007 commented Oct 14, 2024 • edited Loading

github-actions bot commented Oct 14, 2024 • edited Loading

rndquu commented Oct 14, 2024

rndquu commented Oct 14, 2024

0x4007 left a comment

Choose a reason for hiding this comment

0x4007 Oct 14, 2024

Choose a reason for hiding this comment

0x4007 Oct 14, 2024

Choose a reason for hiding this comment

0x4007 Oct 14, 2024

Choose a reason for hiding this comment

0x4007 Oct 14, 2024

Choose a reason for hiding this comment

0x4007 Oct 14, 2024

Choose a reason for hiding this comment

0x4007 commented Oct 15, 2024

rndquu commented Oct 15, 2024

rndquu commented Oct 14, 2024 •

edited

Loading

ubiquity-os-deployer bot commented Oct 14, 2024 •

edited

Loading

0x4007 commented Oct 14, 2024 •

edited

Loading

github-actions bot commented Oct 14, 2024 •

edited

Loading