Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync staging to main #204

Merged
merged 40 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
dd5533d
refactor: fre-599-create-reusable-components
codingki Feb 15, 2024
9552bb0
Update src/components/common/Spinner.tsx
codingki Feb 15, 2024
474c0b0
Update src/components/RouteDisplay/Step.tsx
codingki Feb 15, 2024
cb955fc
refactor: extract component
codingki Feb 15, 2024
70df515
refactor: fre-600-extract-components-to-a-separated-file
codingki Feb 15, 2024
80b9ad8
fix: add expand route size
codingki Feb 16, 2024
392fa6a
refactor: extract and unify lifecycle tracking logic
codingki Feb 16, 2024
d7e2801
refactor: rename fn and file
codingki Feb 16, 2024
2d1f624
[FRE-602] extract actions composing (#184)
codingki Feb 20, 2024
1afccb0
chore(deps): add dotenv
codingki Feb 23, 2024
d7249c8
chore: add make-actions and make-step unit test
codingki Feb 23, 2024
30ee5ab
feat: automated e2e test
codingki Feb 23, 2024
1d61d72
chore: update readme
codingki Feb 23, 2024
9d6130e
feat: return error message from response
codingki Feb 27, 2024
a5bc436
fix: APP_URL cors issue
codingki Feb 28, 2024
e51c6be
Merge pull request #195 from skip-mev/fix/api-APP_URL-cors-issue
codingki Feb 28, 2024
ec3617e
Merge pull request #191 from skip-mev/kiki/fre-598-epic-transaction-t…
codingki Feb 29, 2024
1e6cb3e
Merge pull request #194 from skip-mev/feat/return-error-message-from-…
codingki Feb 29, 2024
1b99a6c
chore: sync chain-registry
codingki Feb 29, 2024
90cc31a
chore(deps): bump skip router sdk
codingki Feb 29, 2024
cea589f
fix: fees display
codingki Feb 29, 2024
4032b1a
Merge pull request #196 from skip-mev/fix/fees-display
codingki Feb 29, 2024
bcd7440
fix: check ledger query key and enabled opts
codingki Mar 4, 2024
422bffe
fix: evm to evm chain connection
codingki Mar 4, 2024
debe849
Merge pull request #197 from skip-mev/fix--wallet-issues
codingki Mar 4, 2024
fab9cbf
Merge pull request #198 from skip-mev/fix-station-wallet-signing
codingki Mar 4, 2024
4d3e8a7
Banner URL Fix & Remove Contact Email
daviddzhou Mar 5, 2024
ad5302e
Bring back contact.ts
daviddzhou Mar 5, 2024
f227b30
Merge pull request #200 from skip-mev/fix-header-and-contact
codingki Mar 5, 2024
97c2341
update skip-router and update necessary code to support hyperlane
thal0x Mar 6, 2024
c9bcb6b
catch up to staging
thal0x Mar 6, 2024
9b53e5c
remove console log
thal0x Mar 6, 2024
1638a14
Merge pull request #201 from skip-mev/jw/hyperlane-support
thal0x Mar 6, 2024
5eedabd
add manta chain
codingki Mar 6, 2024
e332a3a
Merge pull request #202 from skip-mev/add-manta-chain
codingki Mar 6, 2024
470eb38
bump router sdk
codingki Mar 7, 2024
e57523b
chore: sync chain registry
codingki Mar 7, 2024
e43d93c
adjust swap venues changes
codingki Mar 7, 2024
52cbe5d
fix flickering ledger warning
codingki Mar 7, 2024
808364e
Merge pull request #203 from skip-mev/bump-router-sdk
codingki Mar 7, 2024
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
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,15 @@ Read more on all available environment variables in [`.env.example`](.env.exampl
- build production bundle: `npm run build`
- run production server: `npm run start` (must run `build` first)

## Testing

`npm run test` will run the unit tests.
`npm run test:e2e` will run the automated end-to-end tests. Make sure you have `WORD_PHRASE_KEY=""`(12 word phrase key) in your `.env` file. This will be used to importing the wallet and perform the tests.

## Contributing

Feel free to open an issue or submit a pull request for any bugs and/or improvements.

## Contact

Reach out to our [support email](mailto:[email protected]), or join our [Discord](https://skip.money/discord) server.
Reach out by joining our [Discord](https://skip.money/discord) server.
2 changes: 1 addition & 1 deletion chain-registry
Submodule chain-registry updated 107 files
1 change: 1 addition & 0 deletions env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ declare namespace NodeJS {
readonly NEXT_PUBLIC_WALLETCONNECT_PROJECT_ID?: string;
readonly RESEND_API_KEY?: string;
readonly WALLETCONNECT_VERIFY_KEY?: string;
readonly WORD_PHRASE_KEY?: string;
}
}

Expand Down
20 changes: 16 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@radix-ui/react-scroll-area": "^1.0.5",
"@radix-ui/react-tooltip": "^1.0.7",
"@sentry/nextjs": "^7.99.0",
"@skip-router/core": "^1.3.5",
"@skip-router/core": "^1.3.12",
"@tailwindcss/forms": "^0.5.7",
"@tanstack/query-sync-storage-persister": "^5.18.1",
"@tanstack/react-query": "^5.18.1",
Expand All @@ -71,6 +71,7 @@
"clsx": "^2.1.0",
"cosmjs-types": "0.8.x",
"date-fns": "^3.3.1",
"dotenv": "^16.4.5",
"download": "^8.0.0",
"match-sorter": "^6.3.3",
"next": "^14.1.0",
Expand Down
9 changes: 8 additions & 1 deletion playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ import { defineConfig, devices } from "@playwright/test";

export default defineConfig({
testDir: "./tests",
globalSetup: "./tests/lib/globalSetup.ts",
timeout: 600000,
fullyParallel: true,
forbidOnly: !!process.env.CI,
retries: process.env.CI ? 2 : 0,
retries: process.env.CI ? 2 : 2,
workers: 1,
reporter: "html",
use: {
Expand All @@ -17,4 +19,9 @@ export default defineConfig({
use: { ...devices["Desktop Chrome"] },
},
],
webServer: {
command: "npm run dev",
url: "http://localhost:3000",
reuseExistingServer: !process.env.CI,
},
});
1 change: 1 addition & 0 deletions src/components/AssetSelect/AssetSelectContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ function AssetSelectContent({ assets = [], balances, onChange, onClose, showChai
{filteredAssets.map((asset) => (
<button
key={`${asset.chainID}-${asset.denom}`}
data-testid="asset-item"
className="flex w-full items-center gap-4 rounded-xl p-4 text-left transition-colors hover:bg-[#ECD9D9] focus:-outline-offset-2"
onClick={() => (onClose(), onChange?.(asset))}
>
Expand Down
1 change: 1 addition & 0 deletions src/components/AssetSelect/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ function AssetSelect({ asset, assets, balances, onChange, showChainInfo, isBalan
"disabled:cursor-not-allowed disabled:opacity-50",
)}
disabled={!assets || assets.length === 0}
data-testid="select-asset"
>
{asset && (
<img
Expand Down
1 change: 1 addition & 0 deletions src/components/ChainSelect/ChainSelectContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ function ChainSelectContent({ chains, onChange, onClose }: Props) {
className="flex w-full items-center gap-4 rounded-xl p-4 text-left transition-colors hover:bg-[#ECD9D9] focus:-outline-offset-2"
key={chain.chainID}
onClick={() => onChange(chain)}
data-testid="chain-item"
>
<img
alt={chain.prettyName}
Expand Down
1 change: 1 addition & 0 deletions src/components/ChainSelect/ChainSelectTrigger.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const ChainSelectTrigger = forwardRef<HTMLButtonElement, Props>(
"border border-neutral-200 hover:border-neutral-300",
)}
ref={ref}
data-testid={"select-chain"}
{...props}
>
<span className="flex-1">{chain ? chain.prettyName : "Select Chain"}</span>
Expand Down
17 changes: 17 additions & 0 deletions src/components/Icons/ExpandArrow.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { ComponentProps } from "react";

export const ExpandArrow = ({ className, ...props }: ComponentProps<"svg">) => (
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 20 20"
fill="currentColor"
className={className}
{...props}
>
<path
fillRule="evenodd"
d="M10 3a.75.75 0 01.55.24l3.25 3.5a.75.75 0 11-1.1 1.02L10 4.852 7.3 7.76a.75.75 0 01-1.1-1.02l3.25-3.5A.75.75 0 0110 3zm-3.76 9.2a.75.75 0 011.06.04l2.7 2.908 2.7-2.908a.75.75 0 111.1 1.02l-3.25 3.5a.75.75 0 01-1.1 0l-3.25-3.5a.75.75 0 01.04-1.06z"
clipRule="evenodd"
/>
</svg>
);
27 changes: 27 additions & 0 deletions src/components/Icons/Spinner.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { ComponentProps } from "react";

import { cn } from "@/utils/ui";

export const Spinner = ({ className, ...props }: ComponentProps<"svg">) => (
<svg
className={cn("animate-spin", className)}
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
{...props}
>
<circle
className="opacity-25"
cx={12}
cy={12}
r={10}
stroke="currentColor"
strokeWidth={4}
/>
<path
className="opacity-75"
fill="currentColor"
d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
/>
</svg>
);
Loading
Loading