From 0a0debc950c86ba924d5ca83553dcd9422b0ff25 Mon Sep 17 00:00:00 2001 From: Iveta Date: Tue, 12 Mar 2024 11:01:34 -0400 Subject: [PATCH 1/4] Update network order --- src/components/NetworkIndicator/styles.scss | 5 +++++ src/components/NetworkSelector/index.tsx | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/components/NetworkIndicator/styles.scss b/src/components/NetworkIndicator/styles.scss index 88482f13..4b13201e 100644 --- a/src/components/NetworkIndicator/styles.scss +++ b/src/components/NetworkIndicator/styles.scss @@ -23,6 +23,11 @@ --NetworkSelector-dot-color: var(--sds-clr-lilac-09); } + &[data-network="testnet"] { + // TODO: update color + --NetworkSelector-dot-color: var(--sds-clr-gray-09); + } + &[data-network="mainnet"] { --NetworkSelector-dot-color: var(--sds-clr-green-09); } diff --git a/src/components/NetworkSelector/index.tsx b/src/components/NetworkSelector/index.tsx index 4c235563..f8665ada 100644 --- a/src/components/NetworkSelector/index.tsx +++ b/src/components/NetworkSelector/index.tsx @@ -22,13 +22,6 @@ 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", @@ -36,6 +29,13 @@ const NetworkOptions: Network[] = [ 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", From c07d86d310d2d6ecfc535e7fea10d7aa6ccf7bbe Mon Sep 17 00:00:00 2001 From: Iveta Date: Tue, 12 Mar 2024 13:41:12 -0400 Subject: [PATCH 2/4] Fix test --- src/components/NetworkIndicator/styles.scss | 3 +-- tests/networkSelector.test.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/NetworkIndicator/styles.scss b/src/components/NetworkIndicator/styles.scss index 4b13201e..d5ae9840 100644 --- a/src/components/NetworkIndicator/styles.scss +++ b/src/components/NetworkIndicator/styles.scss @@ -24,8 +24,7 @@ } &[data-network="testnet"] { - // TODO: update color - --NetworkSelector-dot-color: var(--sds-clr-gray-09); + --NetworkSelector-dot-color: var(--sds-clr-sky-09); } &[data-network="mainnet"] { diff --git a/tests/networkSelector.test.ts b/tests/networkSelector.test.ts index 1e3165fe..47dbb010 100644 --- a/tests/networkSelector.test.ts +++ b/tests/networkSelector.test.ts @@ -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 ({ From a689e742c440b2eadfd2ea5490b9e23beedc8542 Mon Sep 17 00:00:00 2001 From: Iveta Date: Wed, 13 Mar 2024 10:11:37 -0400 Subject: [PATCH 3/4] Upgrade SDS --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3fc73bfc..d8d54006 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/yarn.lock b/yarn.lock index bd132e26..a64c1000 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" From 639d86b7c8c2a4f1ad691cf023518a55ada20724 Mon Sep 17 00:00:00 2001 From: Iveta Date: Wed, 13 Mar 2024 14:21:38 -0400 Subject: [PATCH 4/4] Add warning for futurenet --- src/components/NetworkSelector/index.tsx | 13 ++++++++++++- src/components/NetworkSelector/styles.scss | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/components/NetworkSelector/index.tsx b/src/components/NetworkSelector/index.tsx index f8665ada..1d58fae1 100644 --- a/src/components/NetworkSelector/index.tsx +++ b/src/components/NetworkSelector/index.tsx @@ -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"; @@ -277,6 +277,17 @@ export const NetworkSelector = () => {
+ {activeNetworkId === "futurenet" ? ( + } + > + Futurenet is an unstable network. We recommend using Testnet for + your development purposes. + + ) : null} +