Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
kasparkallas authored Oct 10, 2024
2 parents 2b0d03a + c99fba3 commit fb9be03
Show file tree
Hide file tree
Showing 30 changed files with 882 additions and 966 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@ jobs:
timeout-minutes: 5

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true

- uses: pnpm/action-setup@v2
with:
version: 8
- uses: pnpm/action-setup@v4

- name: Install dependencies
run: pnpm install --frozen-lockfile
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/snapshot-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,12 @@ jobs:
timeout-minutes: 5

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true

- uses: pnpm/action-setup@v2
with:
version: 8
- uses: pnpm/action-setup@v4

- name: Install dependencies
run: pnpm install --frozen-lockfile
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Generate matrix
id: set-matrix
Expand All @@ -41,16 +41,16 @@ jobs:
file: ${{ fromJson(needs.test-setup.outputs.matrix) }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4
with:
version: 8

- name: Setup Node.js 16.x
uses: actions/setup-node@v2
- name: Setup Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 20.x

- name: Install dependencies
run: pnpm i
Expand Down
16 changes: 8 additions & 8 deletions apps/hosted-widget/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,27 @@
"@emotion/styled": "^11.13.0",
"@mui/icons-material": "^5.16.7",
"@mui/material": "^5.16.7",
"@reown/appkit": "^1.0.7",
"@reown/appkit-adapter-wagmi": "^1.0.7",
"@segment/analytics-next": "^1.74.0",
"@sentry/nextjs": "^7.119.0",
"@reown/appkit": "^1.1.0",
"@reown/appkit-adapter-wagmi": "^1.1.0",
"@segment/analytics-next": "^1.75.0",
"@sentry/nextjs": "^7.119.1",
"@superfluid-finance/widget": "workspace:*",
"@tanstack/react-query": "^5.59.0",
"@tanstack/react-query": "^5.59.8",
"clsx": "^2.1.1",
"next": "13.4.19",
"react": "^18.3.1",
"react-blockies": "^1.4.1",
"react-dom": "^18.3.1",
"viem": "^2.21.18",
"viem": "^2.21.21",
"wagmi": "^2.12.17",
"zod": "^3.23.8"
},
"devDependencies": {
"@types/node": "^22.7.4",
"@types/node": "^22.7.5",
"@types/react": "^18.3.11",
"@types/react-blockies": "^1.4.4",
"eslint": "^8.57.1",
"eslint-config-next": "^13.5.7",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
}
}
6 changes: 6 additions & 0 deletions apps/widget-builder/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ module.exports = {
port: "",
pathname: "/superfluid-finance/**/*",
},
{
protocol: "https",
hostname: "superfluid-finance.github.io",
port: "",
pathname: "/**/*",
},
],
},
env: {
Expand Down
10 changes: 5 additions & 5 deletions apps/widget-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"@mui/lab": "5.0.0-alpha.147",
"@mui/material": "^5.16.7",
"@pinata/sdk": "^2.1.0",
"@segment/analytics-next": "^1.74.0",
"@sentry/nextjs": "^7.119.0",
"@segment/analytics-next": "^1.75.0",
"@sentry/nextjs": "^7.119.1",
"@superfluid-finance/widget": "workspace:*",
"@web3modal/ethereum": "^2.7.1",
"@web3modal/react": "^2.7.1",
Expand All @@ -37,21 +37,21 @@
"react-google-recaptcha": "^3.1.0",
"react-hook-form": "~7.47.0",
"request-ip": "^3.3.0",
"viem": "^2.21.18",
"viem": "^2.21.21",
"wagmi": "^2.12.17",
"zod": "^3.23.8",
"zod-to-json-schema": "^3.23.3"
},
"devDependencies": {
"@hookform/devtools": "^4.3.1",
"@types/lodash": "^4.17.10",
"@types/node": "^22.7.4",
"@types/node": "^22.7.5",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"@types/react-google-recaptcha": "^2.1.9",
"@types/request-ip": "^0.0.41",
"eslint": "^8.57.1",
"eslint-config-next": "^13.5.7",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
}
}
2 changes: 1 addition & 1 deletion apps/widget-builder/src/hooks/useDemoMode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const demoPaymentDetails: WidgetProps["paymentDetails"] = {
receiverAddress: "0xf26ce9749f29e61c25d0333bce2301cb2dfd3a22", // rebounder
chainId: supportedNetwork.optimismSepolia.id,
superToken: {
address: "0x00d05Eed85Bad962bA5237DD4aFFF12004455a8a", // fUSDCx
address: "0x131780640edf9830099aac2203229073d6d2fe69", // fUSDCx
},
flowRate: {
amountEther: "1",
Expand Down
8 changes: 4 additions & 4 deletions examples/b2b-service-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"tsc": "tsc --noEmit"
},
"dependencies": {
"@sentry/nextjs": "^7.119.0",
"@sentry/nextjs": "^7.119.1",
"@superfluid-finance/widget": "workspace:*",
"@web3modal/ethereum": "^2.7.1",
"@web3modal/react": "^2.7.1",
"next": "13.4.19",
"react": "18.2.0",
"react-dom": "18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-use-intercom": "^5.4.1",
"viem": "^2.21.18",
"viem": "^2.21.21",
"wagmi": "^2.12.17",
"zod": "^3.23.8"
},
Expand Down
8 changes: 4 additions & 4 deletions examples/donation-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"tsc": "tsc --noEmit"
},
"dependencies": {
"@sentry/nextjs": "^7.119.0",
"@sentry/nextjs": "^7.119.1",
"@superfluid-finance/widget": "workspace:*",
"@web3modal/ethereum": "^2.7.1",
"@web3modal/react": "^2.7.1",
"next": "13.4.19",
"react": "18.2.0",
"react-dom": "18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-use-intercom": "^5.4.1",
"viem": "^2.21.18",
"viem": "^2.21.21",
"wagmi": "^2.12.17",
"zod": "^3.23.8"
},
Expand Down
8 changes: 4 additions & 4 deletions examples/gated-community-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
"tsc": "tsc --noEmit"
},
"dependencies": {
"@sentry/nextjs": "^7.119.0",
"@sentry/nextjs": "^7.119.1",
"@superfluid-finance/widget": "workspace:*",
"@web3modal/ethereum": "^2.7.1",
"@web3modal/react": "^2.7.1",
"next": "13.4.19",
"react": "18.2.0",
"react-dom": "18.2.0",
"viem": "^2.21.18",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"viem": "^2.21.21",
"wagmi": "^2.12.17",
"zod": "^3.23.8"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/widget-vite-react-rainbowkit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@superfluid-finance/widget": "workspace:*",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"viem": "^2.21.18",
"viem": "^2.21.21",
"wagmi": "^2.12.17",
"zod": "^3.23.8"
},
Expand All @@ -28,7 +28,7 @@
"eslint": "^8.57.1",
"eslint-plugin-react-hooks": "5.0.0-canary-41f0e9dae-20230907",
"eslint-plugin-react-refresh": "^0.4.12",
"typescript": "^5.6.2",
"typescript": "^5.6.3",
"vite": "^4.5.5"
}
}
4 changes: 2 additions & 2 deletions examples/widget-vite-react-web3modal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@web3modal/react": "^2.7.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"viem": "^2.21.18",
"viem": "^2.21.21",
"wagmi": "^2.12.17",
"zod": "^3.23.8"
},
Expand All @@ -29,7 +29,7 @@
"eslint": "^8.57.1",
"eslint-plugin-react-hooks": "5.0.0-canary-41f0e9dae-20230907",
"eslint-plugin-react-refresh": "^0.4.12",
"typescript": "^5.6.2",
"typescript": "^5.6.3",
"vite": "^4.5.5"
}
}
4 changes: 2 additions & 2 deletions examples/widget-webcomponent/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"tsc": "tsc --noEmit"
},
"dependencies": {
"@superfluid-finance/tokenlist": "^5.8.2",
"@superfluid-finance/tokenlist": "^5.9.0",
"@superfluid-finance/widget": "workspace:*"
},
"devDependencies": {
"typescript": "^5.6.2",
"typescript": "^5.6.3",
"vite": "^4.5.5"
}
}
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,15 @@
"npm-run-all": "^4.1.5",
"prettier": "^3.3.3",
"turbo": "^1.13.4",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
},
"packageManager": "pnpm@9.12.0",
"packageManager": "pnpm@9.11.0",
"pnpm": {
"overrides": {
"eslint-plugin-react-hooks": "5.0.0-canary-41f0e9dae-20230907",
"@wagmi/core": "2"
"@wagmi/core": "2",
"react-dom": "^18.3.1",
"react": "^18.3.1"
}
}
}
8 changes: 8 additions & 0 deletions packages/widget/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @superfluid-finance/widget

## 0.5.1

### Patch Changes

- d0248c8: Update deps
- d0248c8: Make Native Asset Super Tokens wrappable
- d0248c8: Update token list

## 0.5.0

### Minor Changes
Expand Down
16 changes: 8 additions & 8 deletions packages/widget/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superfluid-finance/widget",
"version": "0.5.0",
"version": "0.5.1",
"private": false,
"license": "MIT",
"type": "module",
Expand Down Expand Up @@ -72,9 +72,9 @@
"@mui/icons-material": "^5.16.7",
"@mui/lab": "5.0.0-alpha.147",
"@mui/utils": "^5.16.6",
"@superfluid-finance/metadata": "^1.5.0",
"@superfluid-finance/tokenlist": "^5.8.2",
"@tanstack/react-query": "^5.59.0",
"@superfluid-finance/metadata": "^1.5.1",
"@superfluid-finance/tokenlist": "^5.9.0",
"@tanstack/react-query": "^5.59.8",
"abitype": "^0.10.3",
"blockies-ts": "^1.0.0",
"immer": "^10.1.1",
Expand All @@ -101,14 +101,14 @@
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.2",
"@wagmi/cli": "^2.1.16",
"@wagmi/core": "2",
"jsdom": "^22.1.0",
"tsconfig": "workspace:*",
"typedoc": "^0.25.13",
"typescript": "^5.6.2",
"viem": "^2.21.18",
"typescript": "^5.6.3",
"viem": "^2.21.21",
"vitest": "^0.34.6",
"wagmi": "^2.12.17",
"@wagmi/core": "^2.13.8"
"wagmi": "^2.12.17"
},
"peerDependencies": {
"viem": "^2",
Expand Down
6 changes: 5 additions & 1 deletion packages/widget/src/CheckoutSummary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ export function CheckoutSummary() {
const startingBalanceDate = useMemo(() => new Date(), []);

const superToken = useMemo(
() => getSuperToken(subscribeCommand.superTokenAddress),
() =>
getSuperToken(
subscribeCommand.chainId,
subscribeCommand.superTokenAddress,
),
[subscribeCommand.superTokenAddress, getSuperToken],
);

Expand Down
Loading

0 comments on commit fb9be03

Please sign in to comment.