From 961a0e57572956a1f9d4950a6654de865bf6f600 Mon Sep 17 00:00:00 2001
From: brusher_ru <brusher.designer@gmail.com>
Date: Tue, 11 Jun 2024 14:26:27 +0300
Subject: [PATCH 1/8] chore: update roadmap

---
 Roadmap.md | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/Roadmap.md b/Roadmap.md
index 5c35ad4..8887884 100644
--- a/Roadmap.md
+++ b/Roadmap.md
@@ -3,6 +3,7 @@
 1. [X] Create wallet
    1. [X] Show mnemonics
    2. [X] Ask to confirm
+      - [X] Click on tag to place a word
    3. [X] Ask display name and password
 
 2. [X] Recover from mnemonics
@@ -74,23 +75,33 @@
 
 --
 
-Z. [X] Lock wallet when idle for some time
+Features
 
-Y. [X] Update wallet format to allow adding other account types, view-only accounts, etc
+- [X] Lock wallet when idle for some time
 
-X. [X] Publish changed @spacemesh/ed25519-bip32
-   0. [X] Make it work well for smapp-lite
-   1. [X] Make it works without breaking change...
-   2. [ ] Open PR (to sdk repo)
-   3. [X] Publish to NPM
-   4. [X] Update smapp-lite/package.json
+- [X] Update wallet format to allow adding other account types, view-only accounts, etc
 
-W. [X] Add VirtualScroll on WalletScreen
+- [X] Publish changed @spacemesh/ed25519-bip32
+  0. [X] Make it work well for smapp-lite
+  1. [X] Make it works without breaking change...
+  2. [ ] Open PR (to sdk repo)
+  3. [X] Publish to NPM
+  4. [X] Update smapp-lite/package.json
 
-V. [X] Auto-fetch data on switching account / network
+- [X] Add VirtualScroll on WalletScreen
 
-U. [ ] Add cache (service worker) for static resources (to allow working offline)
+- [X] Auto-fetch data on switching account / network
 
-T. [ ] Add cache for API requests (if possible to replace POST with GET on API side)
+- [ ] Add cache (service worker) for static resources (to allow working offline)
 
-S. [X] Auto-fetch transactions and rewards periodically
+- [ ] Add cache for API requests (if possible to replace POST with GET on API side)
+
+- [X] Auto-fetch transactions and rewards periodically
+
+- [ ] Add SMH/Smidge Inputs
+
+- [ ] Add QR Code scanner
+
+- [ ] Load more transactions / rewards (now it is limited to latest 1000)
+
+- [ ] Session stickiness
\ No newline at end of file

From a7dc676e4b10b11ee93b43a0e8530f0633405672 Mon Sep 17 00:00:00 2001
From: brusher_ru <brusher.designer@gmail.com>
Date: Wed, 12 Jun 2024 19:41:42 +0300
Subject: [PATCH 2/8] tweak: verify mnemonics by clicking on words

---
 .../createWallet/VerifyMnemonicScreen.tsx     | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/screens/createWallet/VerifyMnemonicScreen.tsx b/src/screens/createWallet/VerifyMnemonicScreen.tsx
index 498a1a6..eeaa94f 100644
--- a/src/screens/createWallet/VerifyMnemonicScreen.tsx
+++ b/src/screens/createWallet/VerifyMnemonicScreen.tsx
@@ -78,6 +78,21 @@ function VerifyMnemonicScreen(): JSX.Element {
     }
   };
 
+  const placeWord = (wordIndex: number, from: SlotIndex) => {
+    if (from === 'bank') {
+      const occupiedSlots = Object.keys(slots);
+      const freeSlots = indexesToCheck
+        .sort((a, b) => a - b)
+        .filter((k) => !occupiedSlots.includes(String(k)));
+      const nextFreeSlot = freeSlots[0];
+      if (!nextFreeSlot) {
+        throw new Error('Cannot find next empty slot');
+      }
+      return moveWord(wordIndex, nextFreeSlot, from);
+    }
+    return moveWord(wordIndex, 'bank', from);
+  };
+
   const allWordsPlaced =
     wordsInBank.length === 0 &&
     Object.entries(slots).every(([k, v]) => parseInt(k, 10) === v);
@@ -100,6 +115,7 @@ function VerifyMnemonicScreen(): JSX.Element {
                 index={wordIndex}
                 from="bank"
                 moveWord={moveWord}
+                placeWord={placeWord}
               />
             ))}
           </CardHeader>
@@ -125,6 +141,7 @@ function VerifyMnemonicScreen(): JSX.Element {
                           index={placedWord}
                           from={idx}
                           moveWord={moveWord}
+                          placeWord={placeWord}
                           full
                         />
                       ) : (
@@ -173,6 +190,7 @@ function VerifyMnemonicScreen(): JSX.Element {
 
 type DraggableTagProps = {
   moveWord: (wordIndex: number, slot: SlotIndex, from: SlotIndex) => void;
+  placeWord: (wordIndex: number, from: SlotIndex) => void;
   from: SlotIndex;
   full?: boolean;
 } & DraggableItem;
@@ -182,6 +200,7 @@ function DraggableTag({
   word,
   index,
   moveWord,
+  placeWord,
   from,
   full,
 }: DraggableTagProps): JSX.Element {
@@ -219,7 +238,7 @@ function DraggableTag({
       opacity={isDragging ? 0.5 : 1}
       userSelect="none"
       fontSize="md"
-      onDoubleClick={() => moveWord(index, 'bank', from)}
+      onClick={() => placeWord(index, from)}
       {...fullStyles}
     >
       {full && typeof from === 'number' && (

From 8b946dbb17d4a5bccbabf07c993c5a501798b63b Mon Sep 17 00:00:00 2001
From: brusher_ru <brusher.designer@gmail.com>
Date: Wed, 12 Jun 2024 19:42:16 +0300
Subject: [PATCH 3/8] tweak: update TransactionService/List request argument

---
 src/api/requests/tx.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/requests/tx.ts b/src/api/requests/tx.ts
index e01882a..7f4f0d7 100644
--- a/src/api/requests/tx.ts
+++ b/src/api/requests/tx.ts
@@ -30,7 +30,7 @@ export const fetchTransactionsChunk = async (
   fetch(`${rpc}/spacemesh.v2alpha1.TransactionService/List`, {
     method: 'POST',
     body: JSON.stringify({
-      principal: address,
+      address,
       include_state: true,
       include_result: true,
       limit,

From aeef18278cbcc4aabbaca4b60cedc09eb81f76f5 Mon Sep 17 00:00:00 2001
From: brusher_ru <brusher.designer@gmail.com>
Date: Wed, 12 Jun 2024 20:49:52 +0300
Subject: [PATCH 4/8] chore: fix deprecated defaultProps

---
 .eslintrc.json                                    |  6 ++++++
 package.json                                      |  2 +-
 src/components/BackButton.tsx                     | 12 ++++--------
 src/components/ExplorerButton.tsx                 | 15 ++++-----------
 src/components/FormAddressSelect.tsx              | 12 +++---------
 src/components/FormInput.tsx                      | 14 ++++----------
 src/components/FormInputViewOnly.tsx              | 11 +++--------
 src/components/FormKeySelect.tsx                  | 12 +++---------
 src/components/FormMultiKeySelect.tsx             |  6 +-----
 src/components/FormSelect.tsx                     | 14 ++++----------
 src/components/FormTextarea.tsx                   | 11 +++--------
 src/components/PasswordInput.tsx                  |  8 +-------
 src/components/PreviewDataRow.tsx                 |  8 ++------
 src/components/TxDetails.tsx                      |  5 -----
 src/screens/createWallet/VerifyMnemonicScreen.tsx |  8 ++------
 yarn.lock                                         |  2 +-
 16 files changed, 42 insertions(+), 104 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index c4713ac..7401342 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -39,6 +39,12 @@
     "react/react-in-jsx-scope": "off",
     "react/jsx-filename-extension": ["warn", { "extensions": [".tsx"] }],
     "react/jsx-props-no-spreading": "off",
+    "react/require-default-props": [
+      "error",
+      {
+        "functions": "defaultArguments"
+      }
+    ],
     "linebreak-style": "off",
     "eol-last": "off",
     "max-len": ["warn", { "code": 80 }],
diff --git a/package.json b/package.json
index a8516a0..240c71d 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "^7.28.0",
+    "eslint-plugin-react": "^7.30.0",
     "eslint-plugin-react-hooks": "^4.3.0",
     "eslint-plugin-simple-import-sort": "^9.0.0",
     "husky": "^8.0.3",
diff --git a/src/components/BackButton.tsx b/src/components/BackButton.tsx
index 38766c7..aca4fc2 100644
--- a/src/components/BackButton.tsx
+++ b/src/components/BackButton.tsx
@@ -3,20 +3,20 @@ import { useNavigate } from 'react-router-dom';
 import { Button } from '@chakra-ui/react';
 import { IconArrowNarrowLeft } from '@tabler/icons-react';
 
+import { noop } from '../utils/func';
+
 type Props = {
   onClick?: () => void;
 };
 
-function BackButton({ onClick }: Props): JSX.Element {
+function BackButton({ onClick = noop }: Props): JSX.Element {
   const navigate = useNavigate();
 
   return (
     <Button
       leftIcon={<IconArrowNarrowLeft />}
       onClick={() => {
-        if (onClick) {
-          onClick();
-        }
+        onClick();
         navigate(-1);
       }}
     >
@@ -25,8 +25,4 @@ function BackButton({ onClick }: Props): JSX.Element {
   );
 }
 
-BackButton.defaultProps = {
-  onClick: null,
-};
-
 export default BackButton;
diff --git a/src/components/ExplorerButton.tsx b/src/components/ExplorerButton.tsx
index 19f81ac..a52a8fe 100644
--- a/src/components/ExplorerButton.tsx
+++ b/src/components/ExplorerButton.tsx
@@ -18,10 +18,10 @@ interface ExplorerButtonProps extends ButtonProps {
 function ExplorerButton({
   dataType,
   value,
-  iconSize,
-  label,
-  full,
-  v2,
+  iconSize = 14,
+  label = 'Open in Explorer',
+  full = false,
+  v2 = false,
   ...buttonProps
 }: ExplorerButtonProps): JSX.Element {
   const { getCurrentNetwork } = useNetworks();
@@ -59,11 +59,4 @@ function ExplorerButton({
   );
 }
 
-ExplorerButton.defaultProps = {
-  v2: false,
-  full: false,
-  iconSize: 14,
-  label: 'Open in Explorer',
-};
-
 export default ExplorerButton;
diff --git a/src/components/FormAddressSelect.tsx b/src/components/FormAddressSelect.tsx
index 59440f6..9d9362c 100644
--- a/src/components/FormAddressSelect.tsx
+++ b/src/components/FormAddressSelect.tsx
@@ -47,9 +47,9 @@ function FormAddressSelect<T extends FieldValues, FieldName extends Path<T>>({
   register,
   unregister,
   errors,
-  isSubmitted,
-  isRequired,
-  children,
+  isSubmitted = false,
+  isRequired = false,
+  children = '',
 }: Props<T, FieldName>): JSX.Element {
   const [origin, setOrigin] = useState(Origin.Local);
   useEffect(() => () => unregister(fieldName), [unregister, fieldName, origin]);
@@ -121,10 +121,4 @@ function FormAddressSelect<T extends FieldValues, FieldName extends Path<T>>({
   );
 }
 
-FormAddressSelect.defaultProps = {
-  isSubmitted: false,
-  isRequired: false,
-  children: '',
-};
-
 export default FormAddressSelect;
diff --git a/src/components/FormInput.tsx b/src/components/FormInput.tsx
index ed5db7c..3469508 100644
--- a/src/components/FormInput.tsx
+++ b/src/components/FormInput.tsx
@@ -27,10 +27,10 @@ function FormInput<T extends FieldValues>({
   label,
   register,
   errors,
-  isSubmitted,
-  children,
-  inputAddon,
-  inputProps,
+  isSubmitted = false,
+  children = '',
+  inputAddon = null,
+  inputProps = {},
 }: Props<T>): JSX.Element {
   const isRequired = !!register.required;
   const error = errors[register.name];
@@ -56,10 +56,4 @@ function FormInput<T extends FieldValues>({
   );
 }
 
-FormInput.defaultProps = {
-  isSubmitted: false,
-  inputAddon: null,
-  inputProps: {},
-};
-
 export default FormInput;
diff --git a/src/components/FormInputViewOnly.tsx b/src/components/FormInputViewOnly.tsx
index d193110..9125bcb 100644
--- a/src/components/FormInputViewOnly.tsx
+++ b/src/components/FormInputViewOnly.tsx
@@ -17,9 +17,9 @@ type Props = PropsWithChildren<{
 
 function FormInputViewOnly({
   label,
-  children,
-  inputAddon,
-  inputProps,
+  children = '',
+  inputAddon = null,
+  inputProps = {},
   value,
 }: Props): JSX.Element {
   return (
@@ -36,9 +36,4 @@ function FormInputViewOnly({
   );
 }
 
-FormInputViewOnly.defaultProps = {
-  inputAddon: null,
-  inputProps: {},
-};
-
 export default FormInputViewOnly;
diff --git a/src/components/FormKeySelect.tsx b/src/components/FormKeySelect.tsx
index c2ecc53..28c73d4 100644
--- a/src/components/FormKeySelect.tsx
+++ b/src/components/FormKeySelect.tsx
@@ -48,9 +48,9 @@ function FormKeySelect<T extends FieldValues, FieldName extends Path<T>>({
   register,
   unregister,
   errors,
-  isSubmitted,
-  isRequired,
-  children,
+  isSubmitted = false,
+  isRequired = false,
+  children = '',
 }: Props<T, FieldName>): JSX.Element {
   const [keyType, setKeyType] = useState(KeyType.Local);
   useEffect(
@@ -116,10 +116,4 @@ function FormKeySelect<T extends FieldValues, FieldName extends Path<T>>({
   );
 }
 
-FormKeySelect.defaultProps = {
-  isSubmitted: false,
-  isRequired: false,
-  children: '',
-};
-
 export default FormKeySelect;
diff --git a/src/components/FormMultiKeySelect.tsx b/src/components/FormMultiKeySelect.tsx
index 8686b52..645c4e1 100644
--- a/src/components/FormMultiKeySelect.tsx
+++ b/src/components/FormMultiKeySelect.tsx
@@ -39,7 +39,7 @@ function FormMultiKeySelect<
   register,
   unregister,
   errors,
-  isSubmitted,
+  isSubmitted = false,
 }: Props<T, FieldName>): JSX.Element {
   const { fields, append, remove } = useFieldArray({
     control,
@@ -92,8 +92,4 @@ function FormMultiKeySelect<
   );
 }
 
-FormMultiKeySelect.defaultProps = {
-  isSubmitted: false,
-};
-
 export default FormMultiKeySelect;
diff --git a/src/components/FormSelect.tsx b/src/components/FormSelect.tsx
index 62781b2..aa31698 100644
--- a/src/components/FormSelect.tsx
+++ b/src/components/FormSelect.tsx
@@ -24,13 +24,13 @@ type Props<T extends FieldValues> = PropsWithChildren<{
 }>;
 
 function FormSelect<T extends FieldValues>({
-  label,
+  label = '',
   options,
   register,
   errors,
-  isSubmitted,
-  children,
-  inputProps,
+  isSubmitted = false,
+  children = '',
+  inputProps = {},
 }: Props<T>): JSX.Element {
   const isRequired = !!register.required;
   const error = errors[register.name];
@@ -63,10 +63,4 @@ function FormSelect<T extends FieldValues>({
   );
 }
 
-FormSelect.defaultProps = {
-  label: '',
-  isSubmitted: false,
-  inputProps: {},
-};
-
 export default FormSelect;
diff --git a/src/components/FormTextarea.tsx b/src/components/FormTextarea.tsx
index 96f2162..0a701b7 100644
--- a/src/components/FormTextarea.tsx
+++ b/src/components/FormTextarea.tsx
@@ -25,9 +25,9 @@ function FormTextarea<T extends FieldValues>({
   label,
   register,
   errors,
-  isSubmitted,
-  children,
-  textareaProps,
+  isSubmitted = false,
+  children = '',
+  textareaProps = { rows: 4 },
 }: Props<T>): JSX.Element {
   const isRequired = !!register.required;
   const error = errors[register.name];
@@ -50,9 +50,4 @@ function FormTextarea<T extends FieldValues>({
   );
 }
 
-FormTextarea.defaultProps = {
-  isSubmitted: false,
-  textareaProps: { rows: 4 },
-};
-
 export default FormTextarea;
diff --git a/src/components/PasswordInput.tsx b/src/components/PasswordInput.tsx
index 8eeb0fa..857a9e4 100644
--- a/src/components/PasswordInput.tsx
+++ b/src/components/PasswordInput.tsx
@@ -11,11 +11,10 @@ import { IconEye, IconEyeOff } from '@tabler/icons-react';
 
 type Props = {
   placeholder?: string;
-  initialValue?: string;
   register: ReturnType<UseFormRegister<FieldValues>>;
 };
 
-function PasswordInput({ placeholder, register }: Props) {
+function PasswordInput({ placeholder = 'Enter password', register }: Props) {
   const [show, setShow] = useState(false);
 
   const toggleShow = () => setShow(!show);
@@ -41,9 +40,4 @@ function PasswordInput({ placeholder, register }: Props) {
   );
 }
 
-PasswordInput.defaultProps = {
-  placeholder: 'Enter password',
-  initialValue: '',
-};
-
 export default PasswordInput;
diff --git a/src/components/PreviewDataRow.tsx b/src/components/PreviewDataRow.tsx
index 4a54fb4..7da81e7 100644
--- a/src/components/PreviewDataRow.tsx
+++ b/src/components/PreviewDataRow.tsx
@@ -9,8 +9,8 @@ type PreviewDataRowProps = {
 function PreviewDataRow({
   label,
   value,
-  labelProps,
-  valueProps,
+  labelProps = {},
+  valueProps = {},
 }: PreviewDataRowProps) {
   return (
     <Box mb={2}>
@@ -23,9 +23,5 @@ function PreviewDataRow({
     </Box>
   );
 }
-PreviewDataRow.defaultProps = {
-  labelProps: {},
-  valueProps: {},
-};
 
 export default PreviewDataRow;
diff --git a/src/components/TxDetails.tsx b/src/components/TxDetails.tsx
index f6f4059..faa6709 100644
--- a/src/components/TxDetails.tsx
+++ b/src/components/TxDetails.tsx
@@ -91,11 +91,6 @@ function Row({ label, value, isCopyable, explorer }: RowProps) {
   );
 }
 
-Row.defaultProps = {
-  isCopyable: false,
-  render: (value: string) => value,
-};
-
 const renderTxSpecificData = (tx: Transaction) => {
   if (isSpendTransaction(tx)) {
     const destination = getDestinationAddress(tx, tx.principal);
diff --git a/src/screens/createWallet/VerifyMnemonicScreen.tsx b/src/screens/createWallet/VerifyMnemonicScreen.tsx
index eeaa94f..49725c5 100644
--- a/src/screens/createWallet/VerifyMnemonicScreen.tsx
+++ b/src/screens/createWallet/VerifyMnemonicScreen.tsx
@@ -202,7 +202,7 @@ function DraggableTag({
   moveWord,
   placeWord,
   from,
-  full,
+  full = false,
 }: DraggableTagProps): JSX.Element {
   const [{ isDragging }, dragRef] = useDrag(() => ({
     type: 'word',
@@ -251,10 +251,6 @@ function DraggableTag({
   );
 }
 
-DraggableTag.defaultProps = {
-  full: false,
-};
-
 type DroppableBoxProps = PropsWithChildren<{
   slot: SlotIndex;
   hasWordInside: boolean;
@@ -262,7 +258,7 @@ type DroppableBoxProps = PropsWithChildren<{
 
 function DroppableBox({
   slot,
-  children,
+  children = '',
   hasWordInside,
 }: DroppableBoxProps): JSX.Element {
   const [{ isOver }, dropRef] = useDrop(() => ({
diff --git a/yarn.lock b/yarn.lock
index ef64596..4f48506 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4246,7 +4246,7 @@ eslint-plugin-react-hooks@^4.3.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596"
   integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==
 
-eslint-plugin-react@^7.28.0:
+eslint-plugin-react@^7.30.0:
   version "7.34.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.34.2.tgz#2780a1a35a51aca379d86d29b9a72adc6bfe6b66"
   integrity sha512-2HCmrU+/JNigDN6tg55cRDKCQWicYAPB38JGSFDQt95jDm8rrvSUo7YPkOIm5l6ts1j1zCvysNcasvfTMQzUOw==

From c08b2242d16ea201517b158626fa5c934662b532 Mon Sep 17 00:00:00 2001
From: brusher_ru <brusher.designer@gmail.com>
Date: Thu, 13 Jun 2024 21:32:36 +0300
Subject: [PATCH 5/8] fix: display amount for pending spend txs and for zero
 amounts

---
 src/__tests__/txUtils.test.ts               |  3 ++
 src/components/TxListItem.tsx               | 15 ++++--
 src/components/sendTx/ConfirmationModal.tsx | 34 ++++++------
 src/components/sendTx/Drain.tsx             | 12 ++---
 src/components/sendTx/MultiSigSpawn.tsx     |  8 +--
 src/components/sendTx/SendTxModal.tsx       | 58 ++++++++++-----------
 src/components/sendTx/SingleSigSpawn.tsx    |  4 +-
 src/components/sendTx/Spend.tsx             |  8 +--
 src/components/sendTx/VaultSpawn.tsx        | 20 +++----
 src/components/sendTx/schemas.ts            | 30 +++++------
 src/utils/tx.ts                             | 18 ++++---
 11 files changed, 112 insertions(+), 98 deletions(-)

diff --git a/src/__tests__/txUtils.test.ts b/src/__tests__/txUtils.test.ts
index 7e8b75b..795c977 100644
--- a/src/__tests__/txUtils.test.ts
+++ b/src/__tests__/txUtils.test.ts
@@ -1,5 +1,7 @@
 import { bech32 } from 'bech32';
 
+import { StdMethods } from '@spacemesh/sm-codec';
+
 import { Transaction } from '../types/tx';
 import { MethodName, TemplateName } from '../utils/templates';
 import { collectTxIdsByAddress } from '../utils/tx';
@@ -21,6 +23,7 @@ describe('collectTxIdsByAddress', () => {
       template: {
         name: TemplateName.SingleSig,
         methodName: MethodName.Spend,
+        method: StdMethods.Spend,
       },
       parsed: {
         Destination: bech32.fromWords(bech32.decode(destination).words),
diff --git a/src/components/TxListItem.tsx b/src/components/TxListItem.tsx
index c731512..53e8336 100644
--- a/src/components/TxListItem.tsx
+++ b/src/components/TxListItem.tsx
@@ -27,7 +27,6 @@ function TxListItem({
   layersPerEpoch,
 }: TxListItemProps): JSX.Element {
   const txBalance = getTxBalance(tx, host);
-
   return (
     <Card
       mb={2}
@@ -60,8 +59,18 @@ function TxListItem({
             </Text>
           </Box>
           <Flex flexDirection="column" textAlign="right">
-            <Text flex={1} color={txBalance < BigInt(0) ? 'red.600' : 'green'}>
-              {txBalance !== 0 ? formatSmidge(txBalance) : ''}
+            <Text
+              flex={1}
+              color={
+                // eslint-disable-next-line no-nested-ternary
+                txBalance === null || txBalance === BigInt(0)
+                  ? 'gray'
+                  : txBalance < BigInt(0)
+                  ? 'red.600'
+                  : 'green'
+              }
+            >
+              {txBalance !== null && formatSmidge(txBalance)}
             </Text>
             <Text color="gray" fontSize="xx-small" title="Fee" mb="2px">
               {formatSmidge(-1n * BigInt(tx.gas.maxGas))}
diff --git a/src/components/sendTx/ConfirmationModal.tsx b/src/components/sendTx/ConfirmationModal.tsx
index 0b9b23a..477d5c8 100644
--- a/src/components/sendTx/ConfirmationModal.tsx
+++ b/src/components/sendTx/ConfirmationModal.tsx
@@ -64,7 +64,7 @@ const renderTemplateSpecificFields = (form: FormValues) => {
     case StdPublicKeys.SingleSig: {
       if (form.payload.methodSelector === MethodSelectors.SelfSpawn) {
         const args = SingleSigSpawnSchema.parse(form.payload);
-        return <PreviewDataRow label="Public key" value={args.publicKey} />;
+        return <PreviewDataRow label="Public key" value={args.PublicKey} />;
       }
       if (form.payload.methodSelector === MethodSelectors.Spend) {
         const args = SpendSchema.parse(form.payload);
@@ -72,9 +72,9 @@ const renderTemplateSpecificFields = (form: FormValues) => {
           <>
             <PreviewDataRow
               label="Destination address"
-              value={args.destination}
+              value={args.Destination}
             />
-            <PreviewDataRow label="Amount" value={formatSmidge(args.amount)} />
+            <PreviewDataRow label="Amount" value={formatSmidge(args.Amount)} />
           </>
         );
       }
@@ -93,9 +93,9 @@ const renderTemplateSpecificFields = (form: FormValues) => {
           <>
             <PreviewDataRow
               label="Required signatures"
-              value={String(args.required)}
+              value={String(args.Required)}
             />
-            {args.publicKeys.map((pk, i) => (
+            {args.PublicKeys.map((pk, i) => (
               <PreviewDataRow key={pk} label={`Public Key ${i}`} value={pk} />
             ))}
           </>
@@ -107,9 +107,9 @@ const renderTemplateSpecificFields = (form: FormValues) => {
           <>
             <PreviewDataRow
               label="Destination address"
-              value={args.destination}
+              value={args.Destination}
             />
-            <PreviewDataRow label="Amount" value={formatSmidge(args.amount)} />
+            <PreviewDataRow label="Amount" value={formatSmidge(args.Amount)} />
           </>
         );
       }
@@ -120,12 +120,12 @@ const renderTemplateSpecificFields = (form: FormValues) => {
         const args = DrainSchema.parse(form.payload);
         return (
           <>
-            <PreviewDataRow label="Vault address" value={args.vault} />
+            <PreviewDataRow label="Vault address" value={args.Vault} />
             <PreviewDataRow
               label="Destination address"
-              value={String(args.destination)}
+              value={String(args.Destination)}
             />
-            <PreviewDataRow label="Amount" value={String(args.amount)} />
+            <PreviewDataRow label="Amount" value={String(args.Amount)} />
           </>
         );
       }
@@ -141,22 +141,22 @@ const renderTemplateSpecificFields = (form: FormValues) => {
         const args = VaultSpawnSchema.parse(form.payload);
         return (
           <>
-            <PreviewDataRow label="Owner address" value={args.owner} />
+            <PreviewDataRow label="Owner address" value={args.Owner} />
             <PreviewDataRow
               label="Total amount"
-              value={String(args.totalAmount)}
+              value={String(args.TotalAmount)}
             />
             <PreviewDataRow
               label="Initial unlock amount"
-              value={String(args.initialUnlockAmount)}
+              value={String(args.InitialUnlockAmount)}
             />
             <PreviewDataRow
               label="Vesting start (layer)"
-              value={String(args.vestingStart)}
+              value={String(args.VestingStart)}
             />
             <PreviewDataRow
               label="Vesting end (layer)"
-              value={String(args.vestingEnd)}
+              value={String(args.VestingEnd)}
             />
           </>
         );
@@ -167,9 +167,9 @@ const renderTemplateSpecificFields = (form: FormValues) => {
           <>
             <PreviewDataRow
               label="Destination address"
-              value={args.destination}
+              value={args.Destination}
             />
-            <PreviewDataRow label="Amount" value={formatSmidge(args.amount)} />
+            <PreviewDataRow label="Amount" value={formatSmidge(args.Amount)} />
           </>
         );
       }
diff --git a/src/components/sendTx/Drain.tsx b/src/components/sendTx/Drain.tsx
index 23821c9..6ca2c41 100644
--- a/src/components/sendTx/Drain.tsx
+++ b/src/components/sendTx/Drain.tsx
@@ -32,9 +32,9 @@ function Drain({
 }: DrainProps): JSX.Element {
   useEffect(
     () => () => {
-      unregister('payload.vault');
-      unregister('payload.destination');
-      unregister('payload.amount');
+      unregister('payload.Vault');
+      unregister('payload.Destination');
+      unregister('payload.Amount');
     },
     [register, unregister]
   );
@@ -50,7 +50,7 @@ function Drain({
           Vault Address:
         </FormLabel>
         <FormAddressSelect
-          fieldName="payload.vault"
+          fieldName="payload.Vault"
           accounts={vaults}
           register={register}
           unregister={noop} // avoid unregistering address on unmount
@@ -64,7 +64,7 @@ function Drain({
           Destination Address:
         </FormLabel>
         <FormAddressSelect
-          fieldName="payload.destination"
+          fieldName="payload.Destination"
           accounts={accounts}
           register={register}
           unregister={noop} // avoid unregistering address on unmount
@@ -76,7 +76,7 @@ function Drain({
       <FormInput
         label="Amount"
         inputProps={{ type: 'number' }}
-        register={register('payload.amount', {
+        register={register('payload.Amount', {
           value: '0',
           setValueAs: (val: string) => BigInt(val).toString(),
         })}
diff --git a/src/components/sendTx/MultiSigSpawn.tsx b/src/components/sendTx/MultiSigSpawn.tsx
index 9fb52da..375f92d 100644
--- a/src/components/sendTx/MultiSigSpawn.tsx
+++ b/src/components/sendTx/MultiSigSpawn.tsx
@@ -21,11 +21,11 @@ function MultiSigSpawn({
   unregister,
 }: MultiSigSpawnProps): JSX.Element {
   useEffect(() => {
-    register('payload.publicKeys', { value: args.PublicKeys });
-    register('payload.required', { value: args.Required });
+    register('payload.PublicKeys', { value: args.PublicKeys });
+    register('payload.Required', { value: args.Required });
     return () => {
-      unregister('payload.publicKeys');
-      unregister('payload.required');
+      unregister('payload.PublicKeys');
+      unregister('payload.Required');
     };
   }, [args, register, unregister]);
 
diff --git a/src/components/sendTx/SendTxModal.tsx b/src/components/sendTx/SendTxModal.tsx
index 5bbd0e2..4b97062 100644
--- a/src/components/sendTx/SendTxModal.tsx
+++ b/src/components/sendTx/SendTxModal.tsx
@@ -241,7 +241,7 @@ function SendTxModal({ isOpen, onClose }: SendTxModalProps): JSX.Element {
               Nonce: BigInt(data.nonce),
               GasPrice: BigInt(data.gasPrice),
               Arguments: {
-                PublicKey: fromHexString(args.publicKey),
+                PublicKey: fromHexString(args.PublicKey),
               },
             }
           );
@@ -250,11 +250,11 @@ function SendTxModal({ isOpen, onClose }: SendTxModalProps): JSX.Element {
             accountsList.find(
               (acc) =>
                 isSingleSigAccount(acc) &&
-                acc.spawnArguments.PublicKey === args.publicKey
+                acc.spawnArguments.PublicKey === args.PublicKey
             )?.displayName || 'external key';
 
           const eligibleKeys = (wallet?.keychain || []).filter(
-            (kp) => kp.publicKey === args.publicKey
+            (kp) => kp.publicKey === args.PublicKey
           );
 
           setTxData({
@@ -283,14 +283,14 @@ function SendTxModal({ isOpen, onClose }: SendTxModalProps): JSX.Element {
               Nonce: BigInt(data.nonce),
               GasPrice: BigInt(data.gasPrice),
               Arguments: {
-                Required: BigInt(args.required),
-                PublicKeys: args.publicKeys.map(fromHexString),
+                Required: BigInt(args.Required),
+                PublicKeys: args.PublicKeys.map(fromHexString),
               },
             }
           );
 
           const eligibleKeys = (wallet?.keychain || []).filter((kp) =>
-            args.publicKeys.includes(kp.publicKey)
+            args.PublicKeys.includes(kp.publicKey)
           );
 
           setTxData({
@@ -302,7 +302,7 @@ function SendTxModal({ isOpen, onClose }: SendTxModalProps): JSX.Element {
               data.templateAddress
             )} account: ${currerntAccount.displayName}`,
           });
-          updateEstimatedGas(encoded, args.required);
+          updateEstimatedGas(encoded, args.Required);
         }
         if (data.templateAddress === StdPublicKeys.Vault) {
           const args = VaultSpawnSchema.parse(data.payload);
@@ -312,11 +312,11 @@ function SendTxModal({ isOpen, onClose }: SendTxModalProps): JSX.Element {
               Nonce: BigInt(data.nonce),
               GasPrice: BigInt(data.gasPrice),
               Arguments: {
-                Owner: getWords(args.owner),
-                TotalAmount: BigInt(args.totalAmount),
-                InitialUnlockAmount: BigInt(args.initialUnlockAmount),
-                VestingStart: BigInt(args.vestingStart),
-                VestingEnd: BigInt(args.vestingEnd),
+                Owner: getWords(args.Owner),
+                TotalAmount: BigInt(args.TotalAmount),
+                InitialUnlockAmount: BigInt(args.InitialUnlockAmount),
+                VestingStart: BigInt(args.VestingStart),
+                VestingEnd: BigInt(args.VestingEnd),
               },
             }
           );
@@ -345,8 +345,8 @@ function SendTxModal({ isOpen, onClose }: SendTxModalProps): JSX.Element {
               Nonce: BigInt(data.nonce),
               GasPrice: BigInt(data.gasPrice),
               Arguments: {
-                Amount: BigInt(args.amount),
-                Destination: getWords(args.destination),
+                Amount: BigInt(args.Amount),
+                Destination: getWords(args.Destination),
               },
             }
           );
@@ -362,8 +362,8 @@ function SendTxModal({ isOpen, onClose }: SendTxModalProps): JSX.Element {
             form: data,
             encoded,
             eligibleKeys,
-            description: `Send ${formatSmidge(args.amount)} to ${
-              args.destination
+            description: `Send ${formatSmidge(args.Amount)} to ${
+              args.Destination
             }`,
           });
           updateEstimatedGas(encoded, 0);
@@ -376,8 +376,8 @@ function SendTxModal({ isOpen, onClose }: SendTxModalProps): JSX.Element {
               Nonce: BigInt(data.nonce),
               GasPrice: BigInt(data.gasPrice),
               Arguments: {
-                Amount: BigInt(args.amount),
-                Destination: getWords(args.destination),
+                Amount: BigInt(args.Amount),
+                Destination: getWords(args.Destination),
               },
             }
           );
@@ -395,8 +395,8 @@ function SendTxModal({ isOpen, onClose }: SendTxModalProps): JSX.Element {
             form: data,
             encoded,
             eligibleKeys,
-            description: `Send ${formatSmidge(args.amount)} to ${
-              args.destination
+            description: `Send ${formatSmidge(args.Amount)} to ${
+              args.Destination
             }`,
           });
           updateEstimatedGas(encoded, curAcc.spawnArguments.Required);
@@ -410,8 +410,8 @@ function SendTxModal({ isOpen, onClose }: SendTxModalProps): JSX.Element {
               Nonce: BigInt(data.nonce),
               GasPrice: BigInt(data.gasPrice),
               Arguments: {
-                Amount: BigInt(args.amount),
-                Destination: getWords(args.destination),
+                Amount: BigInt(args.Amount),
+                Destination: getWords(args.Destination),
               },
             }
           );
@@ -427,7 +427,7 @@ function SendTxModal({ isOpen, onClose }: SendTxModalProps): JSX.Element {
             form: data,
             encoded,
             eligibleKeys,
-            description: `Spawn ${formatSmidge(args.amount)}`,
+            description: `Spawn ${formatSmidge(args.Amount)}`,
           });
           updateEstimatedGas(encoded, 0);
         }
@@ -442,9 +442,9 @@ function SendTxModal({ isOpen, onClose }: SendTxModalProps): JSX.Element {
               Nonce: BigInt(data.nonce),
               GasPrice: BigInt(data.gasPrice),
               Arguments: {
-                Vault: getWords(args.vault),
-                Amount: BigInt(args.amount),
-                Destination: getWords(args.destination),
+                Vault: getWords(args.Vault),
+                Amount: BigInt(args.Amount),
+                Destination: getWords(args.Destination),
               },
             }
           );
@@ -459,9 +459,9 @@ function SendTxModal({ isOpen, onClose }: SendTxModalProps): JSX.Element {
             form: data,
             encoded,
             eligibleKeys,
-            description: `Drain ${formatSmidge(args.amount)} from ${
-              args.vault
-            } to ${args.destination}`,
+            description: `Drain ${formatSmidge(args.Amount)} from ${
+              args.Vault
+            } to ${args.Destination}`,
           });
           const curAcc =
             currerntAccount as AccountWithAddress<VestingSpawnArguments>;
diff --git a/src/components/sendTx/SingleSigSpawn.tsx b/src/components/sendTx/SingleSigSpawn.tsx
index 8855571..3191a18 100644
--- a/src/components/sendTx/SingleSigSpawn.tsx
+++ b/src/components/sendTx/SingleSigSpawn.tsx
@@ -20,8 +20,8 @@ function SingleSigSpawn({
   unregister,
 }: SingleSigSpawnProps): JSX.Element {
   useEffect(() => {
-    register('payload.publicKey', { value: args.PublicKey });
-    return () => unregister('payload.publicKey');
+    register('payload.PublicKey', { value: args.PublicKey });
+    return () => unregister('payload.PublicKey');
   }, [args, register, unregister]);
 
   return (
diff --git a/src/components/sendTx/Spend.tsx b/src/components/sendTx/Spend.tsx
index 809fa75..c20f6bf 100644
--- a/src/components/sendTx/Spend.tsx
+++ b/src/components/sendTx/Spend.tsx
@@ -31,8 +31,8 @@ function Spend({
 }: SpendProps): JSX.Element {
   useEffect(
     () => () => {
-      unregister('payload.destination');
-      unregister('payload.amount');
+      unregister('payload.Destination');
+      unregister('payload.Amount');
     },
     [register, unregister]
   );
@@ -44,7 +44,7 @@ function Spend({
           Destination Address:
         </FormLabel>
         <FormAddressSelect
-          fieldName="payload.destination"
+          fieldName="payload.Destination"
           accounts={accounts}
           register={register}
           unregister={noop} // avoid unregistering address on unmount
@@ -56,7 +56,7 @@ function Spend({
       <FormInput
         label="Amount"
         inputProps={{ type: 'number' }}
-        register={register('payload.amount', {
+        register={register('payload.Amount', {
           value: '0',
           setValueAs: (val: string) => BigInt(val).toString(),
         })}
diff --git a/src/components/sendTx/VaultSpawn.tsx b/src/components/sendTx/VaultSpawn.tsx
index 58093d7..96ecb77 100644
--- a/src/components/sendTx/VaultSpawn.tsx
+++ b/src/components/sendTx/VaultSpawn.tsx
@@ -20,19 +20,19 @@ function VaultSpawn({
   unregister,
 }: VaultSpawnProps): JSX.Element {
   useEffect(() => {
-    register('payload.owner', { value: args.Owner });
-    register('payload.totalAmount', { value: args.TotalAmount });
-    register('payload.initialUnlockAmount', {
+    register('payload.Owner', { value: args.Owner });
+    register('payload.TotalAmount', { value: args.TotalAmount });
+    register('payload.InitialUnlockAmount', {
       value: args.InitialUnlockAmount,
     });
-    register('payload.vestingStart', { value: args.VestingStart });
-    register('payload.vestingEnd', { value: args.VestingEnd });
+    register('payload.VestingStart', { value: args.VestingStart });
+    register('payload.VestingEnd', { value: args.VestingEnd });
     return () => {
-      unregister('payload.owner');
-      unregister('payload.totalAmount');
-      unregister('payload.initialUnlockAmount');
-      unregister('payload.vestingStart');
-      unregister('payload.vestingEnd');
+      unregister('payload.Owner');
+      unregister('payload.TotalAmount');
+      unregister('payload.InitialUnlockAmount');
+      unregister('payload.VestingStart');
+      unregister('payload.VestingEnd');
     };
   }, [args, register, unregister]);
 
diff --git a/src/components/sendTx/schemas.ts b/src/components/sendTx/schemas.ts
index 0934165..fb81e76 100644
--- a/src/components/sendTx/schemas.ts
+++ b/src/components/sendTx/schemas.ts
@@ -12,32 +12,32 @@ import { MethodSelectors } from '../../utils/templates';
 
 export const SpendSchema = z.object({
   methodSelector: z.literal(MethodSelectors.Spend),
-  destination: Bech32AddressSchema,
-  amount: BigIntStringSchema,
+  Destination: Bech32AddressSchema,
+  Amount: BigIntStringSchema,
 });
 
 export type SpendPayload = z.infer<typeof SpendSchema>;
 
 export const DrainSchema = z.object({
   methodSelector: z.literal(MethodSelectors.Drain),
-  vault: Bech32AddressSchema,
-  destination: Bech32AddressSchema,
-  amount: BigIntStringSchema,
+  Vault: Bech32AddressSchema,
+  Destination: Bech32AddressSchema,
+  Amount: BigIntStringSchema,
 });
 
 export type DrainPayload = z.infer<typeof DrainSchema>;
 
 export const SingleSigSpawnSchema = z.object({
   methodSelector: z.literal(MethodSelectors.SelfSpawn),
-  publicKey: HexStringSchema,
+  PublicKey: HexStringSchema,
 });
 
 export type SingleSigSpawnPayload = z.infer<typeof SingleSigSpawnSchema>;
 
 export const MultiSigSpawnSchema = z.object({
   methodSelector: z.literal(MethodSelectors.SelfSpawn),
-  required: z.number().min(0).max(10),
-  publicKeys: z
+  Required: z.number().min(0).max(10),
+  PublicKeys: z
     .array(HexStringSchema)
     .min(1, 'MultiSig account requires at least two parties'),
 });
@@ -46,19 +46,19 @@ export type MultiSigSpawnPayload = z.infer<typeof MultiSigSpawnSchema>;
 
 export const VaultSpawnSchema = z.object({
   methodSelector: z.literal(MethodSelectors.SelfSpawn),
-  owner: Bech32AddressSchema,
-  totalAmount: z.number().min(0),
-  initialUnlockAmount: z.number().min(0),
-  vestingStart: z.number().min(0),
-  vestingEnd: z.number().min(0),
+  Owner: Bech32AddressSchema,
+  TotalAmount: z.number().min(0),
+  InitialUnlockAmount: z.number().min(0),
+  VestingStart: z.number().min(0),
+  VestingEnd: z.number().min(0),
 });
 
 export type VaultSpawnPayload = z.infer<typeof VaultSpawnSchema>;
 
 export const VestingSpawnSchema = z.object({
   methodSelector: z.literal(MethodSelectors.SelfSpawn),
-  required: z.number().min(0).max(10),
-  publicKeys: z
+  Required: z.number().min(0).max(10),
+  PublicKeys: z
     .array(HexStringSchema)
     .min(1, 'Vesting account requires at least two parties'),
 });
diff --git a/src/utils/tx.ts b/src/utils/tx.ts
index 430e505..a68509f 100644
--- a/src/utils/tx.ts
+++ b/src/utils/tx.ts
@@ -1,6 +1,7 @@
 import { bech32 } from 'bech32';
 
 import { D } from '@mobily/ts-belt';
+import { StdMethods } from '@spacemesh/sm-codec';
 
 import { TransactionState } from '../api/schemas/tx';
 import { Bech32Address } from '../types/common';
@@ -25,16 +26,16 @@ export const isSelfSpawnTransaction = (
 ): tx is ParsedSpawnTransaction =>
   tx.template.name === TemplateName.SingleSig &&
   tx.template.methodName === MethodName.SelfSpawn &&
-  !!tx.parsed.PublicKey;
+  !!tx.parsed.publicKey;
 
 export const isSpendTransaction = (
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   tx: Transaction<any>
 ): tx is ParsedSpendTransaction =>
   tx.template.name === TemplateName.SingleSig &&
-  tx.template.methodName === MethodName.Spend &&
-  !!tx.parsed.Destination &&
-  !!tx.parsed.Amount;
+  tx.template.method === StdMethods.Spend &&
+  Object.hasOwn(tx.parsed, 'Destination') &&
+  Object.hasOwn(tx.parsed, 'Amount');
 
 export const getDestinationAddress = <T>(
   tx: Transaction<T>,
@@ -70,7 +71,6 @@ export const collectTxIdsByAddress = (
     const byPrincipal = result[tx.principal] || new Set<string>();
     byPrincipal.add(tx.id);
     result[tx.principal] = byPrincipal;
-
     const destination = getDestinationAddress(tx, tx.principal);
     if (destination && destination !== tx.principal) {
       const byDestination = result[destination] || new Set<string>();
@@ -93,14 +93,16 @@ export const getTxBalance = <T>(tx: Transaction<T>, host: Bech32Address) => {
           case TxType.Spent: {
             return -1n * tx.parsed.Amount;
           }
+          case TxType.Self:
+            return 0n;
           default:
-            return 0;
+            return null;
         }
       }
-      return 0;
+      return null;
     }
     default: {
-      return 0;
+      return null;
     }
   }
 };

From d856c95c2120e9fbfeb100f76c157306296d11f4 Mon Sep 17 00:00:00 2001
From: brusher_ru <brusher.designer@gmail.com>
Date: Thu, 13 Jun 2024 21:38:19 +0300
Subject: [PATCH 6/8] tweak: normalize URLs

---
 src/components/AddNetworkDrawer.tsx |  7 ++++++-
 src/utils/url.ts                    | 12 ++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 src/utils/url.ts

diff --git a/src/components/AddNetworkDrawer.tsx b/src/components/AddNetworkDrawer.tsx
index 32215b0..babe4f2 100644
--- a/src/components/AddNetworkDrawer.tsx
+++ b/src/components/AddNetworkDrawer.tsx
@@ -18,6 +18,7 @@ import {
 
 import { fetchNetworkInfo } from '../api/requests/netinfo';
 import useNetworks from '../store/useNetworks';
+import { normalizeURL } from '../utils/url';
 
 import FormInput from './FormInput';
 
@@ -93,6 +94,7 @@ function AddNetworkDrawer({ isOpen, onClose }: Props): JSX.Element {
               register={register('api', {
                 value: 'https://',
                 required: 'JSON API URL is required',
+                setValueAs: normalizeURL,
                 pattern: {
                   value: /^https?:\/\/.+/,
                   message: 'URL must start with http:// or https://',
@@ -101,7 +103,9 @@ function AddNetworkDrawer({ isOpen, onClose }: Props): JSX.Element {
                   setApiError('');
                   setApiLoading(true);
                   try {
-                    const info = await fetchNetworkInfo(e.target.value);
+                    const info = await fetchNetworkInfo(
+                      normalizeURL(e.target.value)
+                    );
                     if (!info) {
                       throw new Error('Cannot fetch network info');
                     }
@@ -143,6 +147,7 @@ function AddNetworkDrawer({ isOpen, onClose }: Props): JSX.Element {
                   value: /^https?:\/\/.+/,
                   message: 'URL must start with http:// or https://',
                 },
+                setValueAs: normalizeURL,
               })}
               errors={errors}
               isSubmitted={isSubmitted}
diff --git a/src/utils/url.ts b/src/utils/url.ts
new file mode 100644
index 0000000..46c9d1c
--- /dev/null
+++ b/src/utils/url.ts
@@ -0,0 +1,12 @@
+import { pipe } from '@mobily/ts-belt';
+
+export const stripTrailingSlash = (str: string) =>
+  str.endsWith('/') ? str.slice(0, -1) : str;
+
+export const defaultizeHttps = (str: string) =>
+  str.startsWith('https://') || str.startsWith('http://')
+    ? str
+    : `https://${str}`;
+
+export const normalizeURL = (str: string) =>
+  pipe(str, stripTrailingSlash, defaultizeHttps);

From 0f1bab764d6dcf939b29074ea426179387f4b1bc Mon Sep 17 00:00:00 2001
From: brusher_ru <brusher.designer@gmail.com>
Date: Thu, 13 Jun 2024 21:42:31 +0300
Subject: [PATCH 7/8] tweak: add default explorer value

---
 src/components/AddNetworkDrawer.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/AddNetworkDrawer.tsx b/src/components/AddNetworkDrawer.tsx
index babe4f2..28b0c39 100644
--- a/src/components/AddNetworkDrawer.tsx
+++ b/src/components/AddNetworkDrawer.tsx
@@ -147,6 +147,7 @@ function AddNetworkDrawer({ isOpen, onClose }: Props): JSX.Element {
                   value: /^https?:\/\/.+/,
                   message: 'URL must start with http:// or https://',
                 },
+                value: 'https://explorer.spacemesh.io',
                 setValueAs: normalizeURL,
               })}
               errors={errors}

From d9b1d764bb2f68bad29006ada96b773b268ee61d Mon Sep 17 00:00:00 2001
From: brusher_ru <brusher.designer@gmail.com>
Date: Fri, 14 Jun 2024 00:22:09 +0300
Subject: [PATCH 8/8] chore: fix toggle button

---
 src/components/ThemeToggleButton.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/ThemeToggleButton.tsx b/src/components/ThemeToggleButton.tsx
index 1321d32..a70320b 100644
--- a/src/components/ThemeToggleButton.tsx
+++ b/src/components/ThemeToggleButton.tsx
@@ -11,8 +11,6 @@ type ThemeToggleButtonProps = Omit<IconButtonProps, 'aria-label'>;
 const iconSize = 20;
 
 const RoundButton = styled(IconButton, transientOptions)`
-  box-shadow: 0 0 100px 20px
-    ${({ $colorMode }) => ($colorMode === 'light' ? 'black' : 'white')};
   & svg {
     width: ${iconSize}px;
     height: ${iconSize}px;