{rescanInProgress ? (
{t('navbar.text_rescan_in_progress')}
diff --git a/src/components/Onboarding.jsx b/src/components/Onboarding.tsx
similarity index 100%
rename from src/components/Onboarding.jsx
rename to src/components/Onboarding.tsx
diff --git a/src/components/Orderbook.tsx b/src/components/Orderbook.tsx
index 0dbcd2180..5e192d127 100644
--- a/src/components/Orderbook.tsx
+++ b/src/components/Orderbook.tsx
@@ -407,7 +407,7 @@ export function OrderbookOverlay({ nickname, show, onHide }: OrderbookOverlayPro
.catch((e) => {
if (signal.aborted) return
const message = t('orderbook.error_loading_orderbook_failed', {
- reason: e.message || 'Unknown reason',
+ reason: e.message || t('global.errors.reason_unknown'),
})
setAlert({ variant: 'danger', message })
})
diff --git a/src/components/Receive.jsx b/src/components/Receive.tsx
similarity index 92%
rename from src/components/Receive.jsx
rename to src/components/Receive.tsx
index 5fe8ca0a2..d7b059b8c 100644
--- a/src/components/Receive.jsx
+++ b/src/components/Receive.tsx
@@ -1,10 +1,10 @@
-import { useState, useEffect, useMemo } from 'react'
+import { useState, useEffect, useMemo, FormEvent } from 'react'
import * as rb from 'react-bootstrap'
import { useTranslation } from 'react-i18next'
import { useLocation } from 'react-router-dom'
import { useSettings } from '../context/SettingsContext'
import { useServiceInfo } from '../context/ServiceInfoContext'
-import { useCurrentWalletInfo } from '../context/WalletContext'
+import { CurrentWallet, useCurrentWalletInfo } from '../context/WalletContext'
import * as Api from '../libs/JmWalletApi'
import { BitcoinQR } from './BitcoinQR'
import PageTitle from './PageTitle'
@@ -15,20 +15,27 @@ import { SelectableJar, jarFillLevel } from './jars/Jar'
import styles from './Receive.module.css'
import Accordion from './Accordion'
-export default function Receive({ wallet }) {
+interface ReceiveProps {
+ wallet: CurrentWallet
+}
+
+export default function Receive({ wallet }: ReceiveProps) {
const { t } = useTranslation()
const location = useLocation()
const settings = useSettings()
const serviceInfo = useServiceInfo()
const walletInfo = useCurrentWalletInfo()
- const [validated, setValidated] = useState(false)
- const [alert, setAlert] = useState()
+
+ const [alert, setAlert] = useState
()
const [isLoading, setIsLoading] = useState(true)
+
const [address, setAddress] = useState('')
const [amount, setAmount] = useState('')
const [selectedJarIndex, setSelectedJarIndex] = useState(parseInt(location.state?.account, 10) || 0)
+
const [addressCount, setAddressCount] = useState(0)
- const isFormEnabled = useMemo(() => serviceInfo && serviceInfo.rescanning !== true, [serviceInfo])
+ const isFormEnabled = useMemo(() => serviceInfo?.rescanning !== true, [serviceInfo])
+ const [validated, setValidated] = useState(false)
const sortedAccountBalances = useMemo(() => {
if (!walletInfo) return []
@@ -44,12 +51,11 @@ export default function Receive({ wallet }) {
}
const abortCtrl = new AbortController()
- const { name: walletName, token } = wallet
setAlert(undefined)
setIsLoading(true)
- Api.getAddressNew({ walletName, mixdepth: selectedJarIndex, token, signal: abortCtrl.signal })
+ Api.getAddressNew({ ...wallet, mixdepth: selectedJarIndex, signal: abortCtrl.signal })
.then((res) => (res.ok ? res.json() : Api.Helper.throwError(res, t('receive.error_loading_address_failed'))))
.then((data) => setAddress(data.address))
.catch((err) => {
@@ -62,7 +68,7 @@ export default function Receive({ wallet }) {
return () => abortCtrl.abort()
}, [isFormEnabled, wallet, selectedJarIndex, addressCount, t])
- const onSubmit = (e) => {
+ const onSubmit = (e: FormEvent) => {
e.preventDefault()
const form = e.currentTarget
@@ -82,7 +88,7 @@ export default function Receive({ wallet }) {
- {!isLoading && address &&
}
+ {!isLoading && address &&
}
{(isLoading || !address) && (
@@ -92,17 +98,18 @@ export default function Receive({ wallet }) {
- {address && (
- {address}
- )}
- {!address && (
+ {!address ? (
+ ) : (
+ {address}
)}
+
@@ -116,7 +123,6 @@ export default function Receive({ wallet }) {
{t('receive.text_copy_address_confirmed')}
}
- disabled={!address || isLoading}
/>
{checkIsWebShareAPISupported() && }
diff --git a/src/components/RescanChain.tsx b/src/components/RescanChain.tsx
index cbac892e5..6cdb10ef0 100644
--- a/src/components/RescanChain.tsx
+++ b/src/components/RescanChain.tsx
@@ -122,8 +122,7 @@ export default function RescanChain({ wallet }: RescanChainProps) {
setAlert(undefined)
try {
- const requestContext = { walletName: wallet.name, token: wallet.token }
- const res = await Api.getRescanBlockchain({ signal, ...requestContext, blockheight })
+ const res = await Api.getRescanBlockchain({ ...wallet, signal, blockheight })
if (!res.ok) await Api.Helper.throwError(res)
dispatchServiceInfo({
diff --git a/src/components/ScheduleProgress.jsx b/src/components/ScheduleProgress.tsx
similarity index 95%
rename from src/components/ScheduleProgress.jsx
rename to src/components/ScheduleProgress.tsx
index 296a64b90..a9ae98027 100644
--- a/src/components/ScheduleProgress.jsx
+++ b/src/components/ScheduleProgress.tsx
@@ -1,9 +1,9 @@
-import React from 'react'
import * as rb from 'react-bootstrap'
import { Trans, useTranslation } from 'react-i18next'
import styles from './ScheduleProgress.module.css'
+import { Schedule } from '../context/ServiceInfoContext'
-const scheduleToSteps = (schedule) => {
+const scheduleToSteps = (schedule: Schedule) => {
// Example Schedule:
//
// schedule = [
@@ -34,7 +34,7 @@ const scheduleToSteps = (schedule) => {
// Calculate total wait time. Ignores the last element since there's no reason in waiting after the last element completed.
// This is a lower bound estimate for the time the whole scheduler run will take since it doesn't take into account the time
// it takes to find and talk to makers and wait for tx confirmations on the timechain.
- const totalWaitTime = Math.max(
+ const totalWaitTime: Minutes = Math.max(
1,
schedule.slice(0, schedule.length - 1).reduce((acc, tx) => acc + tx[4] * 60, 0),
)
@@ -58,7 +58,11 @@ const scheduleToSteps = (schedule) => {
}
}
-const ScheduleProgress = ({ schedule }) => {
+interface ScheduleProgressProps {
+ schedule: Schedule
+}
+
+const ScheduleProgress = ({ schedule }: ScheduleProgressProps) => {
const { t } = useTranslation()
const steps = scheduleToSteps(schedule)
diff --git a/src/components/Send/index.tsx b/src/components/Send/index.tsx
index ec6295f8d..a10099319 100644
--- a/src/components/Send/index.tsx
+++ b/src/components/Send/index.tsx
@@ -324,11 +324,9 @@ export default function Send({ wallet }: SendProps) {
setPaymentSuccessfulInfoAlert(undefined)
setIsSending(true)
- const requestContext = { walletName: wallet.name, token: wallet.token }
-
let success = false
try {
- const res = await Api.postDirectSend(requestContext, { mixdepth: sourceJarIndex, destination, amount_sats })
+ const res = await Api.postDirectSend({ ...wallet }, { mixdepth: sourceJarIndex, destination, amount_sats })
if (res.ok) {
// TODO: add type for json response
@@ -374,15 +372,17 @@ export default function Send({ wallet }: SendProps) {
setAlert(undefined)
setIsSending(true)
- const requestContext = { walletName: wallet.name, token: wallet.token }
let success = false
try {
- const res = await Api.postCoinjoin(requestContext, {
- mixdepth: sourceJarIndex,
- destination,
- amount_sats,
- counterparties,
- })
+ const res = await Api.postCoinjoin(
+ { ...wallet },
+ {
+ mixdepth: sourceJarIndex,
+ destination,
+ amount_sats,
+ counterparties,
+ },
+ )
if (res.ok) {
const data = await res.json()
@@ -432,7 +432,7 @@ export default function Send({ wallet }: SendProps) {
setAlert(undefined)
const abortCtrl = new AbortController()
- return Api.getTakerStop({ signal: abortCtrl.signal, walletName: wallet.name, token: wallet.token }).catch((err) => {
+ return Api.getTakerStop({ ...wallet, signal: abortCtrl.signal }).catch((err) => {
setAlert({ variant: 'danger', message: err.message })
})
}
@@ -649,9 +649,8 @@ export default function Send({ wallet }: SendProps) {
onConfirm={(selectedJar) => {
const abortCtrl = new AbortController()
return Api.getAddressNew({
+ ...wallet,
signal: abortCtrl.signal,
- walletName: wallet.name,
- token: wallet.token,
mixdepth: selectedJar,
})
.then((res) =>
diff --git a/src/components/Settings.test.jsx b/src/components/Settings.test.tsx
similarity index 82%
rename from src/components/Settings.test.jsx
rename to src/components/Settings.test.tsx
index 363269b39..9aa4e6ef0 100644
--- a/src/components/Settings.test.jsx
+++ b/src/components/Settings.test.tsx
@@ -3,15 +3,16 @@ import { render, screen } from '../testUtils'
import { act } from 'react-dom/test-utils'
import Settings from './Settings'
+import { CurrentWallet } from '../context/WalletContext'
-const dummyWalletName = 'dummy.jmdat'
+const dummyWalletFileName = 'dummy.jmdat'
const dummyToken = 'dummyToken'
describe('', () => {
- const setup = ({ wallet }) => {
+ const setup = ({ wallet }: { wallet: CurrentWallet }) => {
render(
-
+ ({})} />
,
)
}
@@ -20,7 +21,8 @@ describe('', () => {
await act(async () =>
setup({
wallet: {
- name: dummyWalletName,
+ walletFileName: dummyWalletFileName,
+ displayName: dummyWalletFileName,
token: dummyToken,
},
}),
diff --git a/src/components/Settings.jsx b/src/components/Settings.tsx
similarity index 89%
rename from src/components/Settings.jsx
rename to src/components/Settings.tsx
index 7cc43305e..f586c0bec 100644
--- a/src/components/Settings.jsx
+++ b/src/components/Settings.tsx
@@ -1,5 +1,5 @@
import { useEffect, useState, useCallback } from 'react'
-import { Link, useNavigate } from 'react-router-dom'
+import { Link, To, useNavigate } from 'react-router-dom'
import * as rb from 'react-bootstrap'
import { useTranslation } from 'react-i18next'
import Sprite from './Sprite'
@@ -18,8 +18,14 @@ import SeedModal from './settings/SeedModal'
import FeeConfigModal from './settings/FeeConfigModal'
import { isDebugFeatureEnabled } from '../constants/debugFeatures'
import { isFeatureEnabled } from '../constants/features'
+import { CurrentWallet } from '../context/WalletContext'
-export default function Settings({ wallet, stopWallet }) {
+interface SettingsProps {
+ wallet: CurrentWallet
+ stopWallet: () => void
+}
+
+export default function Settings({ wallet, stopWallet }: SettingsProps) {
const { t, i18n } = useTranslation()
const navigate = useNavigate()
const settings = useSettings()
@@ -29,12 +35,12 @@ export default function Settings({ wallet, stopWallet }) {
const [showingSeed, setShowingSeed] = useState(false)
const [showingFeeConfig, setShowingFeeConfig] = useState(false)
const [lockingWallet, setLockingWallet] = useState(false)
- const [showConfirmLockModal, setShowConfirmLockModal] = useState(null)
+ const [showConfirmLockModal, setShowConfirmLockModal] = useState<{ navigateTo: To }>()
const [showLogsEnabled, setShowLogsEnabled] = useState(false)
const [showingLogs, setShowingLogs] = useState(false)
- const [alert, setAlert] = useState(null)
+ const [alert, setAlert] = useState()
- const setTheme = (theme) => {
+ const setTheme = (theme: string) => {
if (window.JM.THEMES.includes(theme)) {
document.documentElement.setAttribute(window.JM.THEME_ROOT_ATTR, theme)
settingsDispatch({ theme })
@@ -45,36 +51,37 @@ export default function Settings({ wallet, stopWallet }) {
const isLightTheme = settings.theme === window.JM.THEMES[0]
const lockWallet = useCallback(
- async ({ force, destination }) => {
- if (!force && (serviceInfo.coinjoinInProgress || serviceInfo.makerRunning)) {
- setShowConfirmLockModal({ destination })
+ async ({ force, navigateTo }: { force: boolean; navigateTo: To }) => {
+ if (!force && (serviceInfo?.coinjoinInProgress || serviceInfo?.makerRunning)) {
+ setShowConfirmLockModal({ navigateTo })
return
}
setLockingWallet(true)
try {
- const { name: walletName, token } = wallet
- const res = await Api.getWalletLock({ walletName, token })
+ const res = await Api.getWalletLock(wallet)
setLockingWallet(false)
if (res.ok || res.status === 401) {
stopWallet()
- navigate(destination)
+ navigate(navigateTo)
} else {
await Api.Helper.throwError(res)
}
- } catch (e) {
+ } catch (e: any) {
setLockingWallet(false)
- setAlert({ variant: 'danger', dismissible: false, message: e.message })
+
+ const message = e.message || t('global.errors.reason_unknown')
+ setAlert({ variant: 'danger', dismissible: false, message })
}
},
- [wallet, stopWallet, navigate, serviceInfo],
+ [wallet, stopWallet, navigate, serviceInfo, t],
)
useEffect(() => {
const abortCtrl = new AbortController()
- fetchFeatures({ token: wallet.token, signal: abortCtrl.signal })
+ fetchFeatures({ ...wallet, signal: abortCtrl.signal })
.then((res) => (res.ok ? res.json() : Api.Helper.throwError(res)))
.then((data) => data && data.features)
.then((features) => {
@@ -97,12 +104,13 @@ export default function Settings({ wallet, stopWallet }) {
{t('settings.section_title_display')}
{alert && }
setShowConfirmLockModal(null)}
+ onCancel={() => setShowConfirmLockModal(undefined)}
onConfirm={() => {
- setShowConfirmLockModal(null)
- lockWallet({ force: true, destination: showConfirmLockModal?.destination })
+ const navigateTo = showConfirmLockModal?.navigateTo || routes.home
+ setShowConfirmLockModal(undefined)
+ lockWallet({ force: true, navigateTo })
}}
>
{(serviceInfo?.makerRunning
@@ -191,7 +199,7 @@ export default function Settings({ wallet, stopWallet }) {
lockWallet({ force: false, destination: routes.walletList })}
+ onClick={() => lockWallet({ force: false, navigateTo: routes.walletList })}
>
{lockingWallet ? (
<>
@@ -212,7 +220,7 @@ export default function Settings({ wallet, stopWallet }) {
lockWallet({ force: false, destination: routes.createWallet })}
+ onClick={() => lockWallet({ force: false, navigateTo: routes.createWallet })}
>
{lockingWallet ? (
<>
diff --git a/src/components/Wallet.test.tsx b/src/components/Wallet.test.tsx
index b5591b097..026d78747 100644
--- a/src/components/Wallet.test.tsx
+++ b/src/components/Wallet.test.tsx
@@ -14,14 +14,14 @@ jest.mock('../libs/JmWalletApi', () => ({
}))
describe('', () => {
- const dummyWalletName = 'dummy.jmdat'
+ const dummyWalletFileName = 'dummy.jmdat'
const dummyPassword = 'correct horse battery staple'
const mockUnlockWallet = jest.fn()
const mockLockWallet = jest.fn()
const setup = ({
- name,
+ walletFileName,
lockWallet = undefined,
unlockWallet = undefined,
isActive = false,
@@ -31,7 +31,7 @@ describe('', () => {
render(
', () => {
})
it('should render inactive wallet without errors', () => {
- act(() => setup({ name: dummyWalletName }))
+ act(() => setup({ walletFileName: dummyWalletFileName }))
- expect(screen.getByText(walletDisplayName(dummyWalletName))).toBeInTheDocument()
+ expect(screen.getByText(walletDisplayName(dummyWalletFileName))).toBeInTheDocument()
expect(screen.getByText('wallets.wallet_preview.wallet_inactive')).toBeInTheDocument()
expect(screen.queryByPlaceholderText('wallets.wallet_preview.placeholder_password')).not.toBeInTheDocument()
expect(screen.queryByText('wallets.wallet_preview.button_unlock')).not.toBeInTheDocument()
@@ -60,7 +60,7 @@ describe('', () => {
})
it('should unlock inactive wallet successfully', async () => {
- await act(async () => setup({ name: dummyWalletName, unlockWallet: mockUnlockWallet }))
+ await act(async () => setup({ walletFileName: dummyWalletFileName, unlockWallet: mockUnlockWallet }))
expect(screen.getByText('wallets.wallet_preview.wallet_inactive')).toBeInTheDocument()
expect(screen.getByText('wallets.wallet_preview.button_unlock')).toBeInTheDocument()
@@ -80,19 +80,19 @@ describe('', () => {
await waitFor(() => screen.findByText('wallets.wallet_preview.button_unlock'))
})
- expect(mockUnlockWallet).toHaveBeenCalledWith(dummyWalletName, dummyPassword)
+ expect(mockUnlockWallet).toHaveBeenCalledWith(dummyWalletFileName, dummyPassword)
})
it('should provide ability to unlock active wallet (i.e. when auth token is missing)', () => {
act(() =>
setup({
- name: dummyWalletName,
+ walletFileName: dummyWalletFileName,
isActive: true,
unlockWallet: mockUnlockWallet,
}),
)
- expect(screen.getByText(walletDisplayName(dummyWalletName))).toBeInTheDocument()
+ expect(screen.getByText(walletDisplayName(dummyWalletFileName))).toBeInTheDocument()
expect(screen.getByText('wallets.wallet_preview.wallet_active')).toBeInTheDocument()
expect(screen.queryByPlaceholderText('wallets.wallet_preview.placeholder_password')).toBeInTheDocument()
expect(screen.queryByText('wallets.wallet_preview.button_unlock')).toBeInTheDocument()
@@ -103,13 +103,13 @@ describe('', () => {
it('should render active wallet without errors', () => {
act(() =>
setup({
- name: dummyWalletName,
+ walletFileName: dummyWalletFileName,
isActive: true,
lockWallet: mockLockWallet,
}),
)
- expect(screen.getByText(walletDisplayName(dummyWalletName))).toBeInTheDocument()
+ expect(screen.getByText(walletDisplayName(dummyWalletFileName))).toBeInTheDocument()
expect(screen.getByText('wallets.wallet_preview.wallet_active')).toBeInTheDocument()
expect(screen.getByText('wallets.wallet_preview.button_open')).toBeInTheDocument()
expect(screen.getByText('wallets.wallet_preview.button_lock')).toBeInTheDocument()
@@ -120,7 +120,7 @@ describe('', () => {
it('should lock active wallet successfully', async () => {
act(() =>
setup({
- name: dummyWalletName,
+ walletFileName: dummyWalletFileName,
isActive: true,
lockWallet: mockLockWallet,
}),
@@ -137,18 +137,18 @@ describe('', () => {
await waitFor(() => screen.findByText('wallets.wallet_preview.button_lock'))
})
- expect(mockLockWallet).toHaveBeenCalledWith(dummyWalletName, { confirmed: false })
+ expect(mockLockWallet).toHaveBeenCalledWith(dummyWalletFileName, { confirmed: false })
})
it('should display earn indicator when maker is running', () => {
- act(() => setup({ name: dummyWalletName, isActive: true, makerRunning: true }))
+ act(() => setup({ walletFileName: dummyWalletFileName, isActive: true, makerRunning: true }))
expect(document.querySelector('.earn-indicator')).toBeInTheDocument()
expect(document.querySelector('.joining-indicator')).toBeNull()
})
it('should display joining indicator when taker is running', () => {
- act(() => setup({ name: dummyWalletName, isActive: true, coinjoinInProgress: true }))
+ act(() => setup({ walletFileName: dummyWalletFileName, isActive: true, coinjoinInProgress: true }))
expect(document.querySelector('.joining-indicator')).toBeInTheDocument()
expect(document.querySelector('.earn-indicator')).toBeNull()
diff --git a/src/components/Wallet.tsx b/src/components/Wallet.tsx
index 83719bc0d..6cf9e0b16 100644
--- a/src/components/Wallet.tsx
+++ b/src/components/Wallet.tsx
@@ -1,4 +1,4 @@
-import { useCallback } from 'react'
+import { useCallback, useMemo } from 'react'
import { Link } from 'react-router-dom'
import { Formik, FormikErrors } from 'formik'
import * as rb from 'react-bootstrap'
@@ -8,18 +8,19 @@ import { TabActivityIndicator, JoiningIndicator } from './ActivityIndicators'
import Sprite from './Sprite'
import { routes } from '../constants/routes'
import styles from './Wallet.module.css'
+import { WalletFileName } from '../libs/JmWalletApi'
interface WalletLockFormProps {
- walletName: string
- lockWallet: (walletName: string, options: { confirmed: boolean }) => Promise
+ walletFileName: WalletFileName
+ lockWallet: (walletFileName: WalletFileName, options: { confirmed: boolean }) => Promise
}
-const WalletLockForm = ({ walletName, lockWallet }: WalletLockFormProps) => {
+const WalletLockForm = ({ walletFileName, lockWallet }: WalletLockFormProps) => {
const { t } = useTranslation()
const onSubmit = useCallback(async () => {
- await lockWallet(walletName, { confirmed: false })
- }, [walletName, lockWallet])
+ await lockWallet(walletFileName, { confirmed: false })
+ }, [walletFileName, lockWallet])
return (
({})} onSubmit={onSubmit}>
@@ -57,8 +58,8 @@ const WalletLockForm = ({ walletName, lockWallet }: WalletLockFormProps) => {
}
interface WalletUnlockFormProps {
- walletName: string
- unlockWallet: (walletName: string, password: string) => Promise
+ walletFileName: WalletFileName
+ unlockWallet: (walletFileName: WalletFileName, password: string) => Promise
}
type WalletUnlockFormValues = {
@@ -69,7 +70,7 @@ const walletUnlockFormInitialValues: WalletUnlockFormValues = {
password: '',
}
-const WalletUnlockForm = ({ walletName, unlockWallet }: WalletUnlockFormProps) => {
+const WalletUnlockForm = ({ walletFileName, unlockWallet }: WalletUnlockFormProps) => {
const { t } = useTranslation()
const validate = (values: WalletUnlockFormValues) => {
@@ -83,9 +84,9 @@ const WalletUnlockForm = ({ walletName, unlockWallet }: WalletUnlockFormProps) =
const onSubmit = useCallback(
async (values) => {
const { password } = values
- await unlockWallet(walletName, password)
+ await unlockWallet(walletFileName, password)
},
- [walletName, unlockWallet],
+ [walletFileName, unlockWallet],
)
return (
@@ -142,9 +143,9 @@ const WalletUnlockForm = ({ walletName, unlockWallet }: WalletUnlockFormProps) =
}
export interface WalletProps {
- name: string
- lockWallet?: (walletName: string, options: { confirmed: boolean }) => Promise
- unlockWallet?: (walletName: string, password: string) => Promise
+ walletFileName: WalletFileName
+ lockWallet?: (walletFileName: WalletFileName, options: { confirmed: boolean }) => Promise
+ unlockWallet?: (walletFileName: WalletFileName, password: string) => Promise
isActive?: boolean
makerRunning?: boolean
coinjoinInProgress?: boolean
@@ -152,7 +153,7 @@ export interface WalletProps {
}
export default function Wallet({
- name,
+ walletFileName,
lockWallet,
unlockWallet,
isActive,
@@ -162,6 +163,8 @@ export default function Wallet({
}: WalletProps) {
const { t } = useTranslation()
+ const displayName = useMemo(() => walletDisplayName(walletFileName), [walletFileName])
+
return (
<>
@@ -173,16 +176,16 @@ export default function Wallet({
{lockWallet ? (
- {walletDisplayName(name)}
+ {displayName}
) : (
- <>{walletDisplayName(name)}
+ <>{displayName}
)}
{makerRunning && }
{coinjoinInProgress && }
) : (
- <>{walletDisplayName(name)}
+ <>{displayName}
)}
@@ -194,10 +197,10 @@ export default function Wallet({
- {unlockWallet && }
+ {unlockWallet && }
)}
diff --git a/src/components/WalletCreationConfirmation.tsx b/src/components/WalletCreationConfirmation.tsx
index 41b84d18f..d12224dc5 100644
--- a/src/components/WalletCreationConfirmation.tsx
+++ b/src/components/WalletCreationConfirmation.tsx
@@ -5,19 +5,20 @@ import { Formik } from 'formik'
import Seedphrase from './Seedphrase'
import ToggleSwitch from './ToggleSwitch'
import { walletDisplayName } from '../utils'
+import { WalletFileName } from '../libs/JmWalletApi'
-export type WalletInfo = {
- walletFileName: string
+export type CreatedWalletInfo = {
+ walletFileName: WalletFileName
password: string
seedphrase: string
}
interface WalletCreationInfoSummaryProps {
- walletInfo: WalletInfo
+ walletInfo: CreatedWalletInfo
revealSensitiveInfo: boolean
}
-export const WalletInfoSummary = ({ walletInfo, revealSensitiveInfo }: WalletCreationInfoSummaryProps) => {
+export const WalletCreationInfoSummary = ({ walletInfo, revealSensitiveInfo }: WalletCreationInfoSummaryProps) => {
const { t } = useTranslation()
return (
<>
@@ -39,7 +40,7 @@ export const WalletInfoSummary = ({ walletInfo, revealSensitiveInfo }: WalletCre
}
interface WalletCreationConfirmationProps {
- wallet: WalletInfo
+ wallet: CreatedWalletInfo
submitButtonText: (isSubmitting: boolean) => React.ReactNode | string
onSubmit: () => Promise
}
@@ -61,7 +62,7 @@ const WalletCreationConfirmation = ({ wallet, submitButtonText, onSubmit }: Wall
>
{({ handleSubmit, isSubmitting }) => (
-
+
({
...jest.requireActual('../libs/JmWalletApi'),
@@ -28,7 +30,7 @@ describe('', () => {
const mockStartWallet = jest.fn()
const mockStopWallet = jest.fn()
- const setup = ({ currentWallet = null }) => {
+ const setup = ({ currentWallet = null }: { currentWallet?: CurrentWallet | null }) => {
render(
@@ -38,14 +40,14 @@ describe('', () => {
beforeEach(() => {
const neverResolvingPromise = new Promise(() => {})
- apiMock.getSession.mockResolvedValue(neverResolvingPromise)
- apiMock.getGetinfo.mockResolvedValue(neverResolvingPromise)
+ ;(apiMock.getSession as jest.Mock).mockResolvedValue(neverResolvingPromise)
+ ;(apiMock.getGetinfo as jest.Mock).mockResolvedValue(neverResolvingPromise)
})
it('should render without errors', () => {
const neverResolvingPromise = new Promise(() => {})
- apiMock.getSession.mockResolvedValueOnce(neverResolvingPromise)
- apiMock.getWalletAll.mockResolvedValueOnce(neverResolvingPromise)
+ ;(apiMock.getSession as jest.Mock).mockResolvedValueOnce(neverResolvingPromise)
+ ;(apiMock.getWalletAll as jest.Mock).mockResolvedValueOnce(neverResolvingPromise)
act(() => setup({}))
@@ -55,10 +57,10 @@ describe('', () => {
})
it('should display error message when loading wallets fails', async () => {
- apiMock.getSession.mockResolvedValueOnce({
+ ;(apiMock.getSession as jest.Mock).mockResolvedValueOnce({
ok: false,
})
- apiMock.getWalletAll.mockResolvedValueOnce({
+ ;(apiMock.getWalletAll as jest.Mock).mockResolvedValueOnce({
ok: false,
})
@@ -74,7 +76,7 @@ describe('', () => {
})
it('should display big call-to-action buttons if no wallet has been created yet', async () => {
- apiMock.getSession.mockResolvedValueOnce({
+ ;(apiMock.getSession as jest.Mock).mockResolvedValueOnce({
ok: true,
json: () =>
Promise.resolve({
@@ -84,11 +86,11 @@ describe('', () => {
wallet_name: 'None',
}),
})
- apiMock.getWalletAll.mockResolvedValueOnce({
+ ;(apiMock.getWalletAll as jest.Mock).mockResolvedValueOnce({
ok: true,
json: () => Promise.resolve({ wallets: [] }),
})
- apiMock.getGetinfo.mockResolvedValueOnce({
+ ;(apiMock.getGetinfo as jest.Mock).mockResolvedValueOnce({
ok: true,
json: () => Promise.resolve({ version: '0.9.10dev' }),
})
@@ -113,7 +115,7 @@ describe('', () => {
})
it('should display login for available wallets', async () => {
- apiMock.getSession.mockResolvedValueOnce({
+ ;(apiMock.getSession as jest.Mock).mockResolvedValueOnce({
ok: true,
json: () =>
Promise.resolve({
@@ -123,11 +125,11 @@ describe('', () => {
wallet_name: 'None',
}),
})
- apiMock.getWalletAll.mockResolvedValueOnce({
+ ;(apiMock.getWalletAll as jest.Mock).mockResolvedValueOnce({
ok: true,
json: () => Promise.resolve({ wallets: ['wallet0.jmdat', 'wallet1.jmdat'] }),
})
- apiMock.getGetinfo.mockResolvedValueOnce({
+ ;(apiMock.getGetinfo as jest.Mock).mockResolvedValueOnce({
ok: true,
json: () => Promise.resolve({ version: '0.9.10dev' }),
})
@@ -152,7 +154,7 @@ describe('', () => {
})
it('should hide "Import Wallet"-button on unsupported backend version', async () => {
- apiMock.getSession.mockResolvedValueOnce({
+ ;(apiMock.getSession as jest.Mock).mockResolvedValueOnce({
ok: true,
json: () =>
Promise.resolve({
@@ -162,11 +164,11 @@ describe('', () => {
wallet_name: 'None',
}),
})
- apiMock.getWalletAll.mockResolvedValueOnce({
+ ;(apiMock.getWalletAll as jest.Mock).mockResolvedValueOnce({
ok: true,
json: () => Promise.resolve({ wallets: [] }),
})
- apiMock.getGetinfo.mockResolvedValueOnce({
+ ;(apiMock.getGetinfo as jest.Mock).mockResolvedValueOnce({
ok: true,
json: () => Promise.resolve({ version: '0.9.9' }),
})
@@ -181,12 +183,12 @@ describe('', () => {
})
describe(' lock/unlock flow', () => {
- const dummyWalletName = 'dummy.jmdat'
+ const dummyWalletFileName = 'dummy.jmdat'
const dummyToken = 'dummyToken'
const dummyPassword = 'correct horse battery staple'
it('should unlock inactive wallet successfully', async () => {
- apiMock.getSession.mockResolvedValueOnce({
+ ;(apiMock.getSession as jest.Mock).mockResolvedValueOnce({
ok: true,
json: () =>
Promise.resolve({
@@ -196,15 +198,15 @@ describe('', () => {
wallet_name: 'None',
}),
})
- apiMock.getWalletAll.mockResolvedValueOnce({
+ ;(apiMock.getWalletAll as jest.Mock).mockResolvedValueOnce({
ok: true,
- json: () => Promise.resolve({ wallets: [dummyWalletName] }),
+ json: () => Promise.resolve({ wallets: [dummyWalletFileName] }),
})
- apiMock.postWalletUnlock.mockResolvedValueOnce({
+ ;(apiMock.postWalletUnlock as jest.Mock).mockResolvedValueOnce({
ok: true,
json: () =>
Promise.resolve({
- walletname: dummyWalletName,
+ walletname: dummyWalletFileName,
token: dummyToken,
refresh_token: dummyToken,
}),
@@ -228,7 +230,7 @@ describe('', () => {
await waitFor(() => screen.findByText('wallets.wallet_preview.button_unlock'))
})
- expect(mockStartWallet).toHaveBeenCalledWith(dummyWalletName, {
+ expect(mockStartWallet).toHaveBeenCalledWith(dummyWalletFileName, {
token: dummyToken,
refresh_token: dummyToken,
})
@@ -238,7 +240,7 @@ describe('', () => {
it('should add alert if unlocking of inactive wallet fails', async () => {
const apiErrorMessage = 'ANY_ERROR_MESSAGE with template '
- apiMock.getSession.mockResolvedValueOnce({
+ ;(apiMock.getSession as jest.Mock).mockResolvedValueOnce({
ok: true,
json: () =>
Promise.resolve({
@@ -248,11 +250,11 @@ describe('', () => {
wallet_name: 'None',
}),
})
- apiMock.getWalletAll.mockResolvedValueOnce({
+ ;(apiMock.getWalletAll as jest.Mock).mockResolvedValueOnce({
ok: true,
- json: () => Promise.resolve({ wallets: [dummyWalletName] }),
+ json: () => Promise.resolve({ wallets: [dummyWalletFileName] }),
})
- apiMock.postWalletUnlock.mockResolvedValueOnce({
+ ;(apiMock.postWalletUnlock as jest.Mock).mockResolvedValueOnce({
ok: false,
json: () => Promise.resolve({ message: apiErrorMessage }),
})
@@ -278,33 +280,34 @@ describe('', () => {
expect(mockStartWallet).not.toHaveBeenCalled()
expect(mockedNavigate).not.toHaveBeenCalled()
- expect(screen.getByText(apiErrorMessage.replace('Wallet', dummyWalletName))).toBeInTheDocument()
+ expect(screen.getByText(apiErrorMessage.replace('Wallet', dummyWalletFileName))).toBeInTheDocument()
})
it('should lock active wallet successfully', async () => {
- apiMock.getSession.mockResolvedValueOnce({
+ ;(apiMock.getSession as jest.Mock).mockResolvedValueOnce({
ok: true,
json: () =>
Promise.resolve({
session: true,
maker_running: false,
coinjoin_in_process: false,
- wallet_name: dummyWalletName,
+ wallet_name: dummyWalletFileName,
}),
})
- apiMock.getWalletAll.mockResolvedValueOnce({
+ ;(apiMock.getWalletAll as jest.Mock).mockResolvedValueOnce({
ok: true,
- json: () => Promise.resolve({ wallets: [dummyWalletName] }),
+ json: () => Promise.resolve({ wallets: [dummyWalletFileName] }),
})
- apiMock.getWalletLock.mockResolvedValueOnce({
+ ;(apiMock.getWalletLock as jest.Mock).mockResolvedValueOnce({
ok: true,
- json: () => Promise.resolve({ walletname: dummyWalletName, already_locked: false }),
+ json: () => Promise.resolve({ walletname: dummyWalletFileName, already_locked: false }),
})
await act(async () =>
setup({
currentWallet: {
- name: dummyWalletName,
+ walletFileName: dummyWalletFileName,
+ displayName: dummyWalletFileName,
token: dummyToken,
},
}),
@@ -328,21 +331,21 @@ describe('', () => {
it('should add alert but clear wallet if locking active wallet fails with UNAUTHORIZED', async () => {
const apiErrorMessage = 'Invalid credentials.'
- apiMock.getSession.mockResolvedValueOnce({
+ ;(apiMock.getSession as jest.Mock).mockResolvedValueOnce({
ok: true,
json: () =>
Promise.resolve({
session: true,
maker_running: false,
coinjoin_in_process: false,
- wallet_name: dummyWalletName,
+ wallet_name: dummyWalletFileName,
}),
})
- apiMock.getWalletAll.mockResolvedValueOnce({
+ ;(apiMock.getWalletAll as jest.Mock).mockResolvedValueOnce({
ok: true,
- json: () => Promise.resolve({ wallets: [dummyWalletName] }),
+ json: () => Promise.resolve({ wallets: [dummyWalletFileName] }),
})
- apiMock.getWalletLock.mockResolvedValueOnce({
+ ;(apiMock.getWalletLock as jest.Mock).mockResolvedValueOnce({
ok: false,
status: 401,
json: () => Promise.resolve({ message: apiErrorMessage }),
@@ -351,7 +354,8 @@ describe('', () => {
await act(async () =>
setup({
currentWallet: {
- name: dummyWalletName,
+ walletFileName: dummyWalletFileName,
+ displayName: dummyWalletFileName,
token: dummyToken,
},
}),
@@ -380,29 +384,30 @@ describe('', () => {
`(
'should confirm locking wallet if maker ($makerRunning) or taker ($coinjoinInProgress) is running',
async ({ makerRunning, coinjoinInProgress, expectedModalBody }) => {
- apiMock.getSession.mockResolvedValueOnce({
+ ;(apiMock.getSession as jest.Mock).mockResolvedValueOnce({
ok: true,
json: () =>
Promise.resolve({
session: true,
maker_running: makerRunning,
coinjoin_in_process: coinjoinInProgress,
- wallet_name: dummyWalletName,
+ wallet_name: dummyWalletFileName,
}),
})
- apiMock.getWalletAll.mockResolvedValueOnce({
+ ;(apiMock.getWalletAll as jest.Mock).mockResolvedValueOnce({
ok: true,
- json: () => Promise.resolve({ wallets: [dummyWalletName] }),
+ json: () => Promise.resolve({ wallets: [dummyWalletFileName] }),
})
- apiMock.getWalletLock.mockResolvedValueOnce({
+ ;(apiMock.getWalletLock as jest.Mock).mockResolvedValueOnce({
ok: true,
- json: () => Promise.resolve({ walletname: dummyWalletName, already_locked: false }),
+ json: () => Promise.resolve({ walletname: dummyWalletFileName, already_locked: false }),
})
await act(async () =>
setup({
currentWallet: {
- name: dummyWalletName,
+ walletFileName: dummyWalletFileName,
+ displayName: dummyWalletFileName,
token: dummyToken,
},
}),
diff --git a/src/components/Wallets.jsx b/src/components/Wallets.tsx
similarity index 74%
rename from src/components/Wallets.jsx
rename to src/components/Wallets.tsx
index c9c9ea954..9b4d686c9 100644
--- a/src/components/Wallets.jsx
+++ b/src/components/Wallets.tsx
@@ -13,85 +13,94 @@ import * as Api from '../libs/JmWalletApi'
import { routes } from '../constants/routes'
import { ConfirmModal } from './Modal'
import { isFeatureEnabled } from '../constants/features'
+import { CurrentWallet } from '../context/WalletContext'
-function arrayEquals(a, b) {
+function arrayEquals(a: any, b: any) {
return Array.isArray(a) && Array.isArray(b) && a.length === b.length && a.every((val, index) => val === b[index])
}
-function sortWallets(wallets, activeWalletName = null) {
- if (activeWalletName && wallets.indexOf(activeWalletName) >= 0) {
- return [activeWalletName, ...sortWallets(wallets.filter((a) => a !== activeWalletName))]
+function sortWallets(
+ wallets: Api.WalletFileName[],
+ activeWalletFileName: Api.WalletFileName | null = null,
+): Api.WalletFileName[] {
+ if (activeWalletFileName && wallets.indexOf(activeWalletFileName) >= 0) {
+ return [activeWalletFileName, ...sortWallets(wallets.filter((a) => a !== activeWalletFileName))]
} else {
return [...wallets].sort((a, b) => a.localeCompare(b))
}
}
-export default function Wallets({ currentWallet, startWallet, stopWallet }) {
+interface WalletsProps {
+ currentWallet: CurrentWallet | null
+ startWallet: (walletFileName: Api.WalletFileName, auth: Api.ApiAuthContext) => void
+ stopWallet: () => void
+}
+
+export default function Wallets({ currentWallet, startWallet, stopWallet }: WalletsProps) {
const { t } = useTranslation()
const navigate = useNavigate()
const serviceInfo = useServiceInfo()
const reloadServiceInfo = useReloadServiceInfo()
- const [walletList, setWalletList] = useState(null)
+ const [walletList, setWalletList] = useState(null)
const [isLoading, setIsLoading] = useState(true)
- const [unlockingWalletName, setUnlockWalletName] = useState(undefined)
- const isUnlocking = useMemo(() => unlockingWalletName !== undefined, [unlockingWalletName])
- const [alert, setAlert] = useState(null)
+ const [unlockingWalletFileName, setUnlockWalletFileName] = useState(undefined)
+ const isUnlocking = useMemo(() => unlockingWalletFileName !== undefined, [unlockingWalletFileName])
+ const [alert, setAlert] = useState()
const [showLockConfirmModal, setShowLockConfirmModal] = useState(false)
- const coinjoinInProgress = useMemo(() => serviceInfo && serviceInfo.coinjoinInProgress, [serviceInfo])
- const makerRunning = useMemo(() => serviceInfo && serviceInfo.makerRunning, [serviceInfo])
+ const coinjoinInProgress = useMemo(() => serviceInfo !== null && serviceInfo.coinjoinInProgress, [serviceInfo])
+ const makerRunning = useMemo(() => serviceInfo !== null && serviceInfo.makerRunning, [serviceInfo])
const unlockWallet = useCallback(
- async (walletName, password) => {
+ async (walletFileName, password) => {
if (currentWallet) {
setAlert({
variant: 'warning',
dismissible: false,
message:
- currentWallet.name === walletName
+ currentWallet.walletFileName === walletFileName
? // unlocking same wallet
- t('wallets.wallet_preview.alert_wallet_already_unlocked', { walletName: walletDisplayName(walletName) })
+ t('wallets.wallet_preview.alert_wallet_already_unlocked', { walletName: currentWallet.displayName })
: // unlocking another wallet while one is already unlocked
- t('wallets.wallet_preview.alert_other_wallet_unlocked', { walletName: walletDisplayName(walletName) }),
+ t('wallets.wallet_preview.alert_other_wallet_unlocked', { walletName: currentWallet.displayName }),
})
return
}
- setAlert(null)
- setUnlockWalletName(walletName)
+ setAlert(undefined)
+ setUnlockWalletFileName(walletFileName)
try {
- const res = await Api.postWalletUnlock({ walletName }, { password })
+ const res = await Api.postWalletUnlock({ walletFileName }, { password })
const body = await (res.ok ? res.json() : Api.Helper.throwError(res))
- setUnlockWalletName(undefined)
+ setUnlockWalletFileName(undefined)
const auth = Api.Helper.parseAuthProps(body)
-
startWallet(body.walletname, auth)
navigate(routes.wallet)
- } catch (e) {
- const message = e.message.replace('Wallet', walletName)
+ } catch (e: any) {
+ const message = e.message?.replace('Wallet', walletFileName)
setAlert({ variant: 'danger', dismissible: false, message })
- setUnlockWalletName(undefined)
+ setUnlockWalletFileName(undefined)
}
},
[currentWallet, setAlert, startWallet, t, navigate],
)
const lockWallet = useCallback(
- async (lockableWalletName, { confirmed = false }) => {
- if (!currentWallet || currentWallet.name !== lockableWalletName) {
+ async (lockableWalletFileName, { confirmed = false }) => {
+ if (!currentWallet || currentWallet.walletFileName !== lockableWalletFileName) {
setAlert({
variant: 'warning',
dismissible: false,
message: currentWallet
? // locking another wallet while active one is still unlocked
t('wallets.wallet_preview.alert_other_wallet_unlocked', {
- walletName: walletDisplayName(currentWallet.name),
+ walletName: currentWallet.displayName,
})
: // locking without active wallet
t('wallets.wallet_preview.alert_wallet_already_locked', {
- walletName: walletDisplayName(lockableWalletName),
+ walletName: walletDisplayName(lockableWalletFileName),
}),
})
return
@@ -103,12 +112,10 @@ export default function Wallets({ currentWallet, startWallet, stopWallet }) {
return
}
- setAlert(null)
+ setAlert(undefined)
try {
- const { name: walletName, token } = currentWallet
-
- const res = await Api.getWalletLock({ walletName, token })
+ const res = await Api.getWalletLock({ ...currentWallet })
// On status OK or UNAUTHORIZED, stop the wallet and clear all local
// information. The token might have become invalid or another one might have been
@@ -119,21 +126,22 @@ export default function Wallets({ currentWallet, startWallet, stopWallet }) {
}
const body = await (res.ok ? res.json() : Api.Helper.throwError(res))
- const { walletname: lockedWalletName, already_locked } = body
+ const { walletname: lockedWalletFileName, already_locked } = body
setAlert({
variant: already_locked ? 'warning' : 'success',
dismissible: false,
message: already_locked
? t('wallets.wallet_preview.alert_wallet_already_locked', {
- walletName: walletDisplayName(lockedWalletName),
+ walletName: walletDisplayName(lockedWalletFileName),
})
: t('wallets.wallet_preview.alert_wallet_locked_successfully', {
- walletName: walletDisplayName(lockedWalletName),
+ walletName: walletDisplayName(lockedWalletFileName),
}),
})
- } catch (e) {
- setAlert({ variant: 'danger', dismissible: false, message: e.message })
+ } catch (e: any) {
+ const message = e.message || t('global.errors.reason_unknown')
+ setAlert({ variant: 'danger', dismissible: false, message })
}
},
[currentWallet, coinjoinInProgress, makerRunning, setAlert, stopWallet, t],
@@ -149,12 +157,12 @@ export default function Wallets({ currentWallet, startWallet, stopWallet }) {
if (!currentWallet) return
setShowLockConfirmModal(false)
- await lockWallet(currentWallet.name, { confirmed: true })
+ await lockWallet(currentWallet.walletFileName, { confirmed: true })
}, [currentWallet, lockWallet])
useEffect(() => {
if (walletList && serviceInfo) {
- const sortedWalletList = sortWallets(walletList, serviceInfo.walletName)
+ const sortedWalletList = sortWallets(walletList, serviceInfo.walletFileName)
if (!arrayEquals(walletList, sortedWalletList)) {
setWalletList(sortedWalletList)
}
@@ -169,7 +177,7 @@ export default function Wallets({ currentWallet, startWallet, stopWallet }) {
const loadingWallets = Api.getWalletAll({ signal: abortCtrl.signal })
.then((res) => (res.ok ? res.json() : Api.Helper.throwError(res, t('wallets.error_loading_failed'))))
- .then((data) => sortWallets(data.wallets || [], currentWallet?.name))
+ .then((data) => sortWallets(data.wallets || [], currentWallet?.walletFileName))
.then((sortedWalletList) => {
if (abortCtrl.signal.aborted) return
@@ -178,7 +186,7 @@ export default function Wallets({ currentWallet, startWallet, stopWallet }) {
if (currentWallet && sortedWalletList.length > 1) {
setAlert({
variant: 'info',
- message: t('wallets.alert_wallet_open', { currentWalletName: walletDisplayName(currentWallet.name) }),
+ message: t('wallets.alert_wallet_open', { currentWalletName: currentWallet.displayName }),
dismissible: false,
})
}
@@ -199,7 +207,7 @@ export default function Wallets({ currentWallet, startWallet, stopWallet }) {
{alert &&
}
@@ -209,19 +217,20 @@ export default function Wallets({ currentWallet, startWallet, stopWallet }) {
{t('wallets.text_loading')}
) : (
- walletList?.map((wallet, index) => {
- const noneActive = !serviceInfo?.walletName
- const isActive = serviceInfo?.walletName === wallet
- const hasToken = currentWallet && currentWallet.token && currentWallet.name === serviceInfo?.walletName
+ walletList?.map((walletFileName, index) => {
+ const noneActive = !serviceInfo?.walletFileName
+ const isActive = serviceInfo?.walletFileName === walletFileName
+ const hasToken =
+ currentWallet && currentWallet.token && currentWallet.walletFileName === serviceInfo?.walletFileName
const showLockOptions = isActive && hasToken
const showUnlockOptions =
- (!isUnlocking || unlockingWalletName === wallet) &&
+ (!isUnlocking || unlockingWalletFileName === walletFileName) &&
(noneActive || (isActive && !hasToken) || (!hasToken && !makerRunning && !coinjoinInProgress))
return (
- Api.postFreeze({ walletName, token }, { utxo: utxo.utxo, freeze: freeze }).then((res) => {
+ Api.postFreeze({ ...wallet }, { utxo: utxo.utxo, freeze: freeze }).then((res) => {
if (res.ok) {
if (!utxo.frozen && freeze) {
utxosThatWereFrozen.push(utxo)
@@ -155,8 +154,7 @@ const CreateFidelityBond = ({ otherFidelityBondExists, wallet, walletInfo, onDon
const abortCtrl = new AbortController()
Api.getAddressTimelockNew({
- walletName: wallet.name,
- token: wallet.token,
+ ...wallet,
signal: abortCtrl.signal,
lockdate: lockDate,
})
@@ -174,14 +172,11 @@ const CreateFidelityBond = ({ otherFidelityBondExists, wallet, walletInfo, onDon
const directSweepToFidelityBond = (jarIndex: JarIndex, address: Api.BitcoinAddress) => {
setIsLoading(true)
- Api.postDirectSend(
- { walletName: wallet.name, token: wallet.token },
- {
- mixdepth: jarIndex,
- destination: address,
- amount_sats: 0, // sweep
- },
- )
+ Api.postDirectSend(wallet, {
+ mixdepth: jarIndex,
+ destination: address,
+ amount_sats: 0, // sweep
+ })
.then((res) =>
res.ok ? res.json() : Api.Helper.throwError(res, t('earn.fidelity_bond.error_creating_fidelity_bond')),
)
diff --git a/src/components/fb/SpendFidelityBondModal.tsx b/src/components/fb/SpendFidelityBondModal.tsx
index 05ecde5ae..d4228e233 100644
--- a/src/components/fb/SpendFidelityBondModal.tsx
+++ b/src/components/fb/SpendFidelityBondModal.tsx
@@ -264,8 +264,7 @@ const SpendFidelityBondModal = ({
}
const abortCtrl = new AbortController()
- const { name: walletName, token } = wallet
- const requestContext = { walletName, token, signal: abortCtrl.signal }
+ const requestContext = { ...wallet, signal: abortCtrl.signal }
const destination = await Api.getAddressNew({ ...requestContext, mixdepth: targetJarIndex })
.then((res) => {
diff --git a/src/components/jar_details/JarDetailsOverlay.tsx b/src/components/jar_details/JarDetailsOverlay.tsx
index b91637bfe..b4d74ea07 100644
--- a/src/components/jar_details/JarDetailsOverlay.tsx
+++ b/src/components/jar_details/JarDetailsOverlay.tsx
@@ -220,10 +220,8 @@ const JarDetailsOverlay = (props: JarDetailsOverlayProps) => {
const abortCtrl = new AbortController()
- const { name: walletName, token } = props.wallet
-
const freezeCalls = utxos.filter(canBeFrozenOrUnfrozen).map((utxo) =>
- Api.postFreeze({ walletName, token, signal: abortCtrl.signal }, { utxo: utxo.utxo, freeze: freeze }).then(
+ Api.postFreeze({ ...props.wallet, signal: abortCtrl.signal }, { utxo: utxo.utxo, freeze: freeze }).then(
(res) => {
if (!res.ok) {
return Api.Helper.throwError(
diff --git a/src/components/settings/FeeConfigModal.tsx b/src/components/settings/FeeConfigModal.tsx
index 6a74fff39..a1f6f37ad 100644
--- a/src/components/settings/FeeConfigModal.tsx
+++ b/src/components/settings/FeeConfigModal.tsx
@@ -404,11 +404,11 @@ export default function FeeConfigModal({
setIsSubmitting(false)
onSuccess && onSuccess()
onHide()
- } catch (err) {
+ } catch (err: any) {
setIsSubmitting(false)
setSaveErrorMessage((_) =>
t('settings.fees.error_saving_fee_config_failed', {
- reason: err instanceof Error ? err.message : 'Unknown',
+ reason: err.message || t('global.errors.reason_unknown'),
}),
)
}
diff --git a/src/components/settings/SeedModal.tsx b/src/components/settings/SeedModal.tsx
index a40867d37..a43ac4e98 100644
--- a/src/components/settings/SeedModal.tsx
+++ b/src/components/settings/SeedModal.tsx
@@ -4,7 +4,6 @@ import { useTranslation } from 'react-i18next'
import Seedphrase from '../Seedphrase'
import ToggleSwitch from '../ToggleSwitch'
import { CurrentWallet } from '../../context/WalletContext'
-import { walletDisplayName } from '../../utils'
import * as Api from '../../libs/JmWalletApi'
interface SeedModalProps {
@@ -25,8 +24,7 @@ export default function SeedModal({ wallet, show, onHide }: SeedModalProps) {
const loadSeed = async () => {
setIsLoading(true)
try {
- const { name: walletName, token } = wallet
- const res = await Api.getWalletSeed({ walletName, token })
+ const res = await Api.getWalletSeed(wallet)
const { seedphrase } = await (res.ok ? res.json() : Api.Helper.throwError(res))
setIsLoading(false)
@@ -45,7 +43,7 @@ export default function SeedModal({ wallet, show, onHide }: SeedModalProps) {
return (
- {walletDisplayName(wallet.name)}
+ {wallet.displayName}
<>
diff --git a/src/context/ServiceConfigContext.tsx b/src/context/ServiceConfigContext.tsx
index f7a547404..f06775cd5 100644
--- a/src/context/ServiceConfigContext.tsx
+++ b/src/context/ServiceConfigContext.tsx
@@ -1,5 +1,5 @@
import { PropsWithChildren, createContext, useCallback, useContext, useEffect, useRef } from 'react'
-import { CurrentWallet, useCurrentWallet } from './WalletContext'
+import { MinimalWalletContext, useCurrentWallet } from './WalletContext'
import * as Api from '../libs/JmWalletApi'
@@ -31,13 +31,13 @@ type LoadConfigValueProps = {
type RefreshConfigValuesProps = {
signal?: AbortSignal
keys: ConfigKey[]
- wallet?: CurrentWallet
+ wallet?: MinimalWalletContext
}
type UpdateConfigValuesProps = {
signal?: AbortSignal
updates: ServiceConfigUpdate[]
- wallet?: CurrentWallet
+ wallet?: MinimalWalletContext
}
const configReducer = (state: ServiceConfig, obj: ServiceConfigUpdate): ServiceConfig => {
@@ -52,12 +52,11 @@ const fetchConfigValues = async ({
configKeys,
}: {
signal?: AbortSignal
- wallet: CurrentWallet
+ wallet: MinimalWalletContext
configKeys: ConfigKey[]
}) => {
- const { name: walletName, token } = wallet
const fetches: Promise[] = configKeys.map((configKey) => {
- return Api.postConfigGet({ walletName, token, signal }, { section: configKey.section, field: configKey.field })
+ return Api.postConfigGet({ ...wallet, signal }, { section: configKey.section, field: configKey.field })
.then((res) => (res.ok ? res.json() : Api.Helper.throwError(res)))
.then((data: JmConfigData) => {
return {
@@ -76,13 +75,12 @@ const pushConfigValues = async ({
updates,
}: {
signal?: AbortSignal
- wallet: CurrentWallet
+ wallet: MinimalWalletContext
updates: ServiceConfigUpdate[]
}) => {
- const { name: walletName, token } = wallet
const fetches: Promise[] = updates.map((update) => {
return Api.postConfigSet(
- { walletName, token, signal },
+ { ...wallet, signal },
{
section: update.key.section,
field: update.key.field,
diff --git a/src/context/ServiceInfoContext.tsx b/src/context/ServiceInfoContext.tsx
index d84c0de08..36167719a 100644
--- a/src/context/ServiceInfoContext.tsx
+++ b/src/context/ServiceInfoContext.tsx
@@ -24,7 +24,7 @@ const SESSION_REQUEST_INTERVAL: Milliseconds = 10_000
type AmountFraction = number
type AmountCounterparties = number
type SchedulerDestinationAddress = 'INTERNAL' | Api.BitcoinAddress
-type WaitTimeInMinutes = number
+type WaitTimeInMinutes = Minutes
type Rounding = number
type StateFlag = 0 | 1 | Api.TxId
@@ -43,9 +43,9 @@ type ScheduleEntry = [
]
type Schedule = ScheduleEntry[]
-interface Offer {
+export interface Offer {
oid: number
- ordertype: string
+ ordertype: Api.OfferType
minsize: Api.AmountSats
maxsize: Api.AmountSats
txfee: Api.AmountSats
@@ -56,7 +56,7 @@ interface JmSessionData {
session: boolean
maker_running: boolean
coinjoin_in_process: boolean
- wallet_name: Api.WalletName | 'None'
+ wallet_name: Api.WalletFileName | 'None'
schedule: Schedule | null
offer_list: Offer[] | null
nickname: string | null
@@ -73,7 +73,7 @@ type CoinjoinInProgressFlag = { coinjoinInProgress: boolean }
type RescanBlockchainInProgressFlag = { rescanning: boolean }
type SessionInfo = {
- walletName: Api.WalletName | null
+ walletFileName: Api.WalletFileName | null
schedule: Schedule | null
offers: Offer[] | null
nickname: string | null
@@ -168,15 +168,15 @@ const ServiceInfoProvider = ({ children }: PropsWithChildren<{}>) => {
session: sessionActive,
maker_running: makerRunning,
coinjoin_in_process: coinjoinInProgress,
- wallet_name: walletNameOrNoneString,
+ wallet_name: walletFileNameOrNoneString,
offer_list: offers,
rescanning,
schedule,
nickname,
} = data
- const activeWalletName = walletNameOrNoneString !== 'None' ? walletNameOrNoneString : null
+ const activeWalletFileName = walletFileNameOrNoneString !== 'None' ? walletFileNameOrNoneString : null
return {
- walletName: activeWalletName,
+ walletFileName: activeWalletFileName,
sessionActive,
makerRunning,
coinjoinInProgress,
@@ -198,7 +198,8 @@ const ServiceInfoProvider = ({ children }: PropsWithChildren<{}>) => {
dispatchServiceInfo(info)
setConnectionError(undefined)
- const activeWalletChanged = currentWallet && (!info.walletName || currentWallet.name !== info.walletName)
+ const activeWalletChanged =
+ currentWallet && (!info.walletFileName || currentWallet.walletFileName !== info.walletFileName)
if (activeWalletChanged) {
resetWalletAndClearSession()
}
@@ -224,7 +225,10 @@ const ServiceInfoProvider = ({ children }: PropsWithChildren<{}>) => {
const abortCtrl = new AbortController()
const refreshSession = () => {
- reloadServiceInfo({ signal: abortCtrl.signal }).catch((err) => console.error(err))
+ reloadServiceInfo({ signal: abortCtrl.signal }).catch((err) => {
+ if (abortCtrl.signal.aborted) return
+ console.error(err)
+ })
}
refreshSession()
diff --git a/src/context/WalletContext.tsx b/src/context/WalletContext.tsx
index f0f43f60a..19ce9aa67 100644
--- a/src/context/WalletContext.tsx
+++ b/src/context/WalletContext.tsx
@@ -1,37 +1,39 @@
import { createContext, useEffect, useCallback, useState, useContext, PropsWithChildren, useMemo } from 'react'
-
import { getSession, setSession } from '../session'
import * as fb from '../components/fb/utils'
import * as Api from '../libs/JmWalletApi'
-
import { WalletBalanceSummary, toBalanceSummary } from './BalanceSummary'
import { JM_API_AUTH_TOKEN_EXPIRY } from '../constants/config'
import { isDevMode } from '../constants/debugFeatures'
+import { walletDisplayName } from '../utils'
const API_AUTH_TOKEN_RENEW_INTERVAL: Milliseconds = isDevMode()
? 60 * 1_000
: Math.round(JM_API_AUTH_TOKEN_EXPIRY * 0.75)
-export interface CurrentWallet {
- name: Api.WalletName
- token: Api.ApiToken
+export type MinimalWalletContext = Api.WithWalletFileName & Api.WithApiToken
+
+export type CurrentWallet = MinimalWalletContext & {
+ displayName: string
}
class CurrentWalletImpl implements CurrentWallet {
- readonly name: Api.WalletName
- #token: Api.ApiToken
-
- constructor(name: Api.WalletName, token: Api.ApiToken) {
- this.name = name
- this.#token = token
+ readonly walletFileName: Api.WalletFileName
+ readonly #displayName: string
+ token: Api.ApiToken // TODO: should be private
+
+ constructor(ctx: MinimalWalletContext) {
+ this.walletFileName = ctx.walletFileName
+ this.#displayName = walletDisplayName(ctx.walletFileName)
+ this.token = ctx.token
}
- get token() {
- return this.#token
+ get displayName() {
+ return this.#displayName
}
updateToken(token: Api.ApiToken) {
- this.#token = token
+ this.token = token
}
}
@@ -120,7 +122,7 @@ type AddressSummary = {
[key: Api.BitcoinAddress]: AddressInfo
}
-type FidenlityBondSummary = {
+type FidelityBondSummary = {
fbOutputs: Utxos
}
@@ -129,14 +131,14 @@ export type UtxosByJar = { [key: JarIndex]: Utxos }
export interface WalletInfo {
balanceSummary: WalletBalanceSummary
addressSummary: AddressSummary
- fidelityBondSummary: FidenlityBondSummary
+ fidelityBondSummary: FidelityBondSummary
utxosByJar: UtxosByJar
data: CombinedRawWalletData
}
interface WalletContextEntry {
currentWallet: T | null
- setCurrentWallet: (currentWallet: CurrentWallet) => void
+ setCurrentWallet: (props: MinimalWalletContext) => void
clearCurrentWallet: () => void
currentWalletInfo: WalletInfo | undefined
reloadCurrentWalletInfo: {
@@ -156,7 +158,7 @@ const toAddressSummary = (res: WalletDisplayResponse): AddressSummary => {
}, {} as AddressSummary)
}
-const toFidelityBondSummary = (res: UtxosResponse): FidenlityBondSummary => {
+const toFidelityBondSummary = (res: UtxosResponse): FidelityBondSummary => {
const fbOutputs = res.utxos
.filter((utxo) => fb.utxo.isFidelityBond(utxo))
.sort((a, b) => {
@@ -178,7 +180,12 @@ const WalletContext = createContext | unde
const restoreWalletFromSession = (): CurrentWalletImpl | null => {
const session = getSession()
- return session?.name && session?.auth?.token ? new CurrentWalletImpl(session.name, session.auth.token) : null
+ return session?.walletFileName && session?.auth?.token
+ ? new CurrentWalletImpl({
+ walletFileName: session.walletFileName,
+ token: session.auth.token,
+ })
+ : null
}
export const groupByJar = (utxos: Utxos): UtxosByJar => {
@@ -211,8 +218,8 @@ const WalletProvider = ({ children }: PropsWithChildren) => {
const [currentWallet, setCurrentWalletOrNull] = useState(restoreWalletFromSession)
const setCurrentWallet = useCallback(
- (wallet: CurrentWallet) => {
- setCurrentWalletOrNull(new CurrentWalletImpl(wallet.name, wallet.token))
+ (ctx: MinimalWalletContext) => {
+ setCurrentWalletOrNull(new CurrentWalletImpl(ctx))
},
[setCurrentWalletOrNull],
)
@@ -230,8 +237,7 @@ const WalletProvider = ({ children }: PropsWithChildren) => {
throw new Error('Cannot load wallet info: Wallet not present')
}
- const { name: walletName, token } = currentWallet
- return await Api.getWalletUtxos({ walletName, token, signal }).then(
+ return await Api.getWalletUtxos({ ...currentWallet, signal }).then(
(res): Promise => (res.ok ? res.json() : Api.Helper.throwError(res)),
)
},
@@ -244,8 +250,8 @@ const WalletProvider = ({ children }: PropsWithChildren) => {
throw new Error('Cannot load wallet info: Wallet not present')
}
- const { name: walletName, token } = currentWallet
- return await Api.getWalletDisplay({ walletName, token, signal }).then(
+ const { walletFileName, token } = currentWallet
+ return await Api.getWalletDisplay({ walletFileName, token, signal }).then(
(res): Promise => (res.ok ? res.json() : Api.Helper.throwError(res)),
)
},
@@ -330,11 +336,14 @@ const WalletProvider = ({ children }: PropsWithChildren) => {
.then((body) => {
const auth = Api.Helper.parseAuthProps(body)
- setSession({ name: currentWallet.name, auth })
+ setSession({ walletFileName: currentWallet.walletFileName, auth })
currentWallet.updateToken(auth.token)
console.debug('Successfully renewed auth token.')
})
- .catch((err) => console.error(err))
+ .catch((err) => {
+ if (abortCtrl.signal.aborted) return
+ console.error(err)
+ })
}
const interval = setInterval(renewToken, API_AUTH_TOKEN_RENEW_INTERVAL)
diff --git a/src/globals.d.ts b/src/globals.d.ts
index 30c01b0c8..a01f6db2e 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -4,6 +4,7 @@ declare type Unit = 'BTC' | 'sats'
type Milliseconds = number
type Seconds = number
+type Minutes = number
declare type MnemonicPhrase = string[]
diff --git a/src/libs/JmWalletApi.ts b/src/libs/JmWalletApi.ts
index f87e4052c..ca85ae7a3 100644
--- a/src/libs/JmWalletApi.ts
+++ b/src/libs/JmWalletApi.ts
@@ -13,7 +13,7 @@
const basePath = () => `${window.JM.PUBLIC_PATH}/api`
type ApiToken = string
-type WalletName = `${string}.jmdat`
+type WalletFileName = `${string}.jmdat`
type Mixdepth = number
type AmountSats = number // TODO: should be BigInt! Remove once every caller migrated to TypeScript.
@@ -40,8 +40,11 @@ type RefreshTokenAuthContext = {
type ApiAuthContext = SingleTokenAuthContext | RefreshTokenAuthContext
-type WithWalletName = {
- walletName: WalletName
+type WithWalletFileName = {
+ walletFileName: WalletFileName
+}
+type WithApiToken = {
+ token: ApiToken
}
type WithMixdepth = {
mixdepth: Mixdepth
@@ -62,11 +65,8 @@ interface ApiRequestContext {
signal?: AbortSignal
}
-interface AuthApiRequestContext extends ApiRequestContext {
- token: ApiToken
-}
-
-type WalletRequestContext = AuthApiRequestContext & WithWalletName
+type AuthApiRequestContext = ApiRequestContext & WithApiToken
+type WalletRequestContext = AuthApiRequestContext & WithWalletFileName
interface ApiError {
message: string
@@ -80,13 +80,13 @@ interface TokenRequest {
}
interface CreateWalletRequest {
- walletname: WalletName | string
+ walletname: WalletFileName | string
password: string
wallettype?: WalletType
}
interface RecoverWalletRequest {
- walletname: WalletName | string
+ walletname: WalletFileName | string
password: string
seedphrase: string
wallettype?: WalletType
@@ -99,12 +99,12 @@ interface WalletUnlockRequest {
// only support starting the maker with native segwit offers
type RelOfferType = 'sw0reloffer'
type AbsOfferType = 'sw0absoffer'
-type OrderType = RelOfferType | AbsOfferType
+type OfferType = RelOfferType | AbsOfferType | string
interface StartMakerRequest {
cjfee_a: AmountSats
cjfee_r: number
- ordertype: OrderType
+ ordertype: OfferType
minsize: AmountSats
}
@@ -268,15 +268,20 @@ const postToken = async ({ signal, token }: AuthApiRequestContext, req: TokenReq
})
}
-const getAddressNew = async ({ token, signal, walletName, mixdepth }: WalletRequestContext & WithMixdepth) => {
- return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/address/new/${mixdepth}`, {
+const getAddressNew = async ({ token, signal, walletFileName, mixdepth }: WalletRequestContext & WithMixdepth) => {
+ return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/address/new/${mixdepth}`, {
headers: { ...Helper.buildAuthHeader(token) },
signal,
})
}
-const getAddressTimelockNew = async ({ token, signal, walletName, lockdate }: WalletRequestContext & WithLockdate) => {
- return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/address/timelock/new/${lockdate}`, {
+const getAddressTimelockNew = async ({
+ token,
+ signal,
+ walletFileName,
+ lockdate,
+}: WalletRequestContext & WithLockdate) => {
+ return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/address/timelock/new/${lockdate}`, {
headers: { ...Helper.buildAuthHeader(token) },
signal,
})
@@ -308,15 +313,15 @@ const postWalletRecover = async ({ signal }: ApiRequestContext, req: RecoverWall
})
}
-const getWalletDisplay = async ({ token, signal, walletName }: WalletRequestContext) => {
- return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/display`, {
+const getWalletDisplay = async ({ token, signal, walletFileName }: WalletRequestContext) => {
+ return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/display`, {
headers: { ...Helper.buildAuthHeader(token) },
signal,
})
}
-const getWalletSeed = async ({ token, signal, walletName }: WalletRequestContext) => {
- return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/getseed`, {
+const getWalletSeed = async ({ token, signal, walletFileName }: WalletRequestContext) => {
+ return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/getseed`, {
headers: { ...Helper.buildAuthHeader(token) },
signal,
})
@@ -328,33 +333,33 @@ const getWalletSeed = async ({ token, signal, walletName }: WalletRequestContext
*
* Note: Performs a non-idempotent GET request.
*/
-const getWalletLock = async ({ token, signal, walletName }: WalletRequestContext) => {
- return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/lock`, {
+const getWalletLock = async ({ token, signal, walletFileName }: WalletRequestContext) => {
+ return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/lock`, {
headers: { ...Helper.buildAuthHeader(token) },
signal,
})
}
const postWalletUnlock = async (
- { signal, walletName }: ApiRequestContext & WithWalletName,
+ { signal, walletFileName }: ApiRequestContext & WithWalletFileName,
{ password }: WalletUnlockRequest,
) => {
- return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/unlock`, {
+ return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/unlock`, {
method: 'POST',
body: JSON.stringify({ password }),
signal,
})
}
-const getWalletUtxos = async ({ token, signal, walletName }: WalletRequestContext) => {
- return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/utxos`, {
+const getWalletUtxos = async ({ token, signal, walletFileName }: WalletRequestContext) => {
+ return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/utxos`, {
headers: { ...Helper.buildAuthHeader(token) },
signal,
})
}
-const postMakerStart = async ({ token, signal, walletName }: WalletRequestContext, req: StartMakerRequest) => {
- return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/maker/start`, {
+const postMakerStart = async ({ token, signal, walletFileName }: WalletRequestContext, req: StartMakerRequest) => {
+ return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/maker/start`, {
method: 'POST',
headers: { ...Helper.buildAuthHeader(token) },
body: JSON.stringify({
@@ -374,15 +379,15 @@ const postMakerStart = async ({ token, signal, walletName }: WalletRequestContex
*
* Note: Performs a non-idempotent GET request.
*/
-const getMakerStop = async ({ token, signal, walletName }: WalletRequestContext) => {
- return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/maker/stop`, {
+const getMakerStop = async ({ token, signal, walletFileName }: WalletRequestContext) => {
+ return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/maker/stop`, {
headers: { ...Helper.buildAuthHeader(token) },
signal,
})
}
-const postDirectSend = async ({ token, signal, walletName }: WalletRequestContext, req: DirectSendRequest) => {
- return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/taker/direct-send`, {
+const postDirectSend = async ({ token, signal, walletFileName }: WalletRequestContext, req: DirectSendRequest) => {
+ return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/taker/direct-send`, {
method: 'POST',
headers: { ...Helper.buildAuthHeader(token) },
body: JSON.stringify(req),
@@ -390,8 +395,8 @@ const postDirectSend = async ({ token, signal, walletName }: WalletRequestContex
})
}
-const postCoinjoin = async ({ token, signal, walletName }: WalletRequestContext, req: DoCoinjoinRequest) => {
- return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/taker/coinjoin`, {
+const postCoinjoin = async ({ token, signal, walletFileName }: WalletRequestContext, req: DoCoinjoinRequest) => {
+ return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/taker/coinjoin`, {
method: 'POST',
headers: { ...Helper.buildAuthHeader(token) },
body: JSON.stringify(req),
@@ -428,10 +433,10 @@ const getYieldgenReport = async ({ signal }: ApiRequestContext) => {
}
const postFreeze = async (
- { token, signal, walletName }: WalletRequestContext,
+ { token, signal, walletFileName }: WalletRequestContext,
{ utxo, freeze = true }: FreezeRequest,
) => {
- return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/freeze`, {
+ return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/freeze`, {
method: 'POST',
headers: { ...Helper.buildAuthHeader(token) },
body: JSON.stringify({
@@ -442,8 +447,11 @@ const postFreeze = async (
})
}
-const postSchedulerStart = async ({ token, signal, walletName }: WalletRequestContext, req: StartSchedulerRequest) => {
- return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/taker/schedule`, {
+const postSchedulerStart = async (
+ { token, signal, walletFileName }: WalletRequestContext,
+ req: StartSchedulerRequest,
+) => {
+ return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/taker/schedule`, {
method: 'POST',
headers: { ...Helper.buildAuthHeader(token) },
body: JSON.stringify({ ...req }),
@@ -451,15 +459,15 @@ const postSchedulerStart = async ({ token, signal, walletName }: WalletRequestCo
})
}
-const getTakerStop = async ({ token, signal, walletName }: WalletRequestContext) => {
- return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/taker/stop`, {
+const getTakerStop = async ({ token, signal, walletFileName }: WalletRequestContext) => {
+ return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/taker/stop`, {
headers: { ...Helper.buildAuthHeader(token) },
signal,
})
}
-const getSchedule = async ({ token, signal, walletName }: WalletRequestContext) => {
- return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/taker/schedule`, {
+const getSchedule = async ({ token, signal, walletFileName }: WalletRequestContext) => {
+ return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/taker/schedule`, {
headers: { ...Helper.buildAuthHeader(token) },
signal,
})
@@ -468,8 +476,8 @@ const getSchedule = async ({ token, signal, walletName }: WalletRequestContext)
/**
* Change a config variable (for the duration of this backend daemon process instance).
*/
-const postConfigSet = async ({ token, signal, walletName }: WalletRequestContext, req: ConfigSetRequest) => {
- return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/configset`, {
+const postConfigSet = async ({ token, signal, walletFileName }: WalletRequestContext, req: ConfigSetRequest) => {
+ return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/configset`, {
method: 'POST',
headers: { ...Helper.buildAuthHeader(token) },
body: JSON.stringify(req),
@@ -482,8 +490,8 @@ const postConfigSet = async ({ token, signal, walletName }: WalletRequestContext
*
* @returns an object with property `configvalue` as string
*/
-const postConfigGet = async ({ token, signal, walletName }: WalletRequestContext, req: ConfigGetRequest) => {
- return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/configget`, {
+const postConfigGet = async ({ token, signal, walletFileName }: WalletRequestContext, req: ConfigGetRequest) => {
+ return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/configget`, {
method: 'POST',
headers: { ...Helper.buildAuthHeader(token) },
body: JSON.stringify(req),
@@ -497,10 +505,10 @@ const postConfigGet = async ({ token, signal, walletName }: WalletRequestContext
const getRescanBlockchain = async ({
token,
signal,
- walletName,
+ walletFileName,
blockheight,
}: WalletRequestContext & WithBlockheight) => {
- return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletName)}/rescanblockchain/${blockheight}`, {
+ return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/rescanblockchain/${blockheight}`, {
headers: { ...Helper.buildAuthHeader(token) },
signal,
})
@@ -545,13 +553,17 @@ export {
JmApiError,
ApiAuthContext,
StartSchedulerRequest,
+ StartMakerRequest,
WalletRequestContext,
ApiToken,
- WalletName,
+ WalletFileName,
+ WithWalletFileName,
+ WithApiToken,
Lockdate,
TxId,
UtxoId,
Mixdepth,
AmountSats,
+ OfferType,
BitcoinAddress,
}
diff --git a/src/session.ts b/src/session.ts
index dacaf43f7..b0bb585df 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -1,9 +1,9 @@
-import { WalletName, ApiAuthContext } from './libs/JmWalletApi'
+import { WalletFileName, ApiAuthContext } from './libs/JmWalletApi'
const SESSION_KEY = 'joinmarket'
export interface SessionItem {
- name: WalletName
+ walletFileName: WalletFileName
auth: ApiAuthContext
}
@@ -11,9 +11,9 @@ export const setSession = (session: SessionItem) => sessionStorage.setItem(SESSI
export const getSession = (): SessionItem | null => {
const json = sessionStorage.getItem(SESSION_KEY)
- const { name, auth }: any = (json && JSON.parse(json)) || {}
- if (name && auth?.token) {
- return { name, auth }
+ const { walletFileName, auth }: any = (json && JSON.parse(json)) || {}
+ if (walletFileName && auth?.token) {
+ return { walletFileName, auth }
} else {
clearSession()
return null
diff --git a/src/utils.ts b/src/utils.ts
index c5979d0a6..de6d44cbe 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,3 +1,5 @@
+import { WalletFileName } from './libs/JmWalletApi'
+
const BTC_FORMATTER = new Intl.NumberFormat('en-US', {
minimumIntegerDigits: 1,
minimumFractionDigits: 8,
@@ -11,7 +13,7 @@ const SATS_FORMATTER = new Intl.NumberFormat('en-US', {
export const BTC: Unit = 'BTC'
export const SATS: Unit = 'sats'
-export const JM_WALLET_FILE_EXTENSION = '.jmdat'
+const JM_WALLET_FILE_EXTENSION = '.jmdat'
export const DUMMY_MNEMONIC_PHRASE: MnemonicPhrase =
'abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about'.split(' ')
@@ -20,7 +22,9 @@ export const SEGWIT_ACTIVATION_BLOCK = 481_824 // https://github.com/bitcoin/bit
export const sanitizeWalletName = (name: string) => name.replace(JM_WALLET_FILE_EXTENSION, '')
-export const walletDisplayName = (name: string) => sanitizeWalletName(name)
+export const walletDisplayNameToFileName = (name: string) => (name + JM_WALLET_FILE_EXTENSION) as WalletFileName
+
+export const walletDisplayName = (fileName: WalletFileName) => sanitizeWalletName(fileName)
export const displayDate = (string: string) => new Date(string).toLocaleString()