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.

Sign up for GitHub

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

Network switch update #778

Merged
merged 4 commits into from
Mar 13, 2024
Merged

Network switch update #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a0debc
Update network order
quietbits Mar 12, 2024
c07d86d
Fix test
quietbits Mar 12, 2024
a689e74
Upgrade SDS
quietbits Mar 13, 2024
639d86b
Add warning for futurenet
quietbits Mar 13, 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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"git-info": "rm -rf src/generated/ && mkdir src/generated/ && echo export default \"{\\\"commitHash\\\": \\\"$(git rev-parse --short HEAD)\\\", \\\"version\\\": \\\"$(git describe --tags --always)\\\"};\" > src/generated/gitInfo.ts"
},
"dependencies": {
"@stellar/design-system": "^2.0.0-beta.5",
"@stellar/design-system": "^2.0.0-beta.7",
"@tanstack/react-query": "^5.24.1",
"@tanstack/react-query-devtools": "^5.24.1",
"dompurify": "^3.0.9",
Expand Down
4 changes: 4 additions & 0 deletions src/components/NetworkIndicator/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
--NetworkSelector-dot-color: var(--sds-clr-lilac-09);
}

&[data-network="testnet"] {
--NetworkSelector-dot-color: var(--sds-clr-sky-09);
}

&[data-network="mainnet"] {
--NetworkSelector-dot-color: var(--sds-clr-green-09);
}
Expand Down
27 changes: 19 additions & 8 deletions src/components/NetworkSelector/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
useRef,
useState,
} from "react";
import { Button, Icon, Input } from "@stellar/design-system";
import { Button, Icon, Input, Notification } from "@stellar/design-system";

import { NetworkIndicator } from "@/components/NetworkIndicator";
import { localStorageSavedNetwork } from "@/helpers/localStorageSavedNetwork";
Expand All @@ -22,20 +22,20 @@ const NetworkOptions: Network[] = [
rpcUrl: "https://rpc-futurenet.stellar.org",
passphrase: "Test SDF Future Network ; October 2022",
},
{
id: "mainnet",
label: "Mainnet",
horizonUrl: "https://horizon.stellar.org",
rpcUrl: "",
passphrase: "Public Global Stellar Network ; September 2015",
},
{
id: "testnet",
label: "Testnet",
horizonUrl: "https://horizon-testnet.stellar.org",
rpcUrl: "https://soroban-testnet.stellar.org",
passphrase: "Test SDF Network ; September 2015",
},
{
id: "mainnet",
label: "Mainnet",
horizonUrl: "https://horizon.stellar.org",
rpcUrl: "",
passphrase: "Public Global Stellar Network ; September 2015",
},
{
id: "custom",
label: "Custom",
Expand Down Expand Up @@ -277,6 +277,17 @@ export const NetworkSelector = () => {
</div>

<div className="NetworkSelector__body__inputs">
{activeNetworkId === "futurenet" ? (
<Notification
variant="warning"
title="Warning"
icon={<Icon.AlertTriangle />}
>
Futurenet is an unstable network. We recommend using Testnet for
your development purposes.
</Notification>
) : null}

<form onSubmit={handleSelectNetwork}>
<Input
id="rpc-url"
Expand Down
2 changes: 2 additions & 0 deletions src/components/NetworkSelector/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@
}

&__inputs {
display: grid;
gap: pxToRem(8px);
padding: pxToRem(6px) pxToRem(8px);
background-color: transparent;
border-radius: pxToRem(4px);
Expand Down
2 changes: 1 addition & 1 deletion tests/networkSelector.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ test.describe("Network selector", () => {
page
.getByTestId("networkSelector-dropdown")
.getByTestId("networkSelector-option"),
).toContainText(["Futurenet", "Mainnet", "Testnet", "Custom"]);
).toContainText(["Futurenet", "Testnet", "Mainnet", "Custom"]);
});

test("Shows correct network data for the selected network", async ({
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,10 @@
resolved "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.6.1.tgz"
integrity sha512-UY+FGM/2jjMkzQLn8pxcHGMaVLh9aEitG3zY2CiY7XHdLiz3bZOwa6oDxNqEMv7zZkV+cj5DOdz0cQ1BP5Hjgw==

"@stellar/design-system@^2.0.0-beta.5":
version "2.0.0-beta.5"
resolved "https://registry.npmjs.org/@stellar/design-system/-/design-system-2.0.0-beta.5.tgz"
integrity sha512-fnFZq+doZcqeX2hTgKUVT6SbSmFaZx6tahBl+qN0z6EuxusNbA29HcWNsptwiZK3lLlqm88Wu3jWcVmhvB6zzg==
"@stellar/design-system@^2.0.0-beta.7":
version "2.0.0-beta.7"
resolved "https://registry.yarnpkg.com/@stellar/design-system/-/design-system-2.0.0-beta.7.tgz#26ee99e67dad5bf260045d5756fb7589fd259a76"
integrity sha512-ofoW/U7wMWsogQI+v4lc4fi+KHVw0MoNFOsH1U2esKa7j3n3AJgpNZogmp2cEYmXplzRlQXrN47rB/u1GspdJg==
dependencies:
"@floating-ui/dom" "^1.5.3"
bignumber.js "^9.1.1"
Expand Down
Loading