+
+
+
-
- {t('send.text_coinjoin_already_running')}
-
-
-
abortCoinjoin()}
- >
-
-
- {t('global.abort')}
-
-
-
- )}
-
-
- {maxFeesConfigMissing && (
-
- {t('send.taker_error_message_max_fees_config_missing')}
-
- {
- setActiveFeeConfigModalSection('cj_fee')
- setShowFeeConfigModal(true)
- }}
- >
- {t('settings.show_fee_config')}
-
-
- )}
- {alert && (
-
- {alert.message}
-
- )}
- {paymentSuccessfulInfoAlert && (
- <>
-
-
- {paymentSuccessfulInfoAlert.message}
-
-
- )}
- {!isLoading && walletInfo && (
-
setDestinationJarPickerShown(false)}
- onConfirm={(selectedJar) => {
- const abortCtrl = new AbortController()
- return Api.getAddressNew({
- ...wallet,
- signal: abortCtrl.signal,
- mixdepth: selectedJar,
- })
- .then((res) =>
- res.ok ? res.json() : Api.Helper.throwError(res, t('receive.error_loading_address_failed')),
- )
- .then((data) => {
- if (abortCtrl.signal.aborted) return
- setDestination(data.address)
- setDestinationJar(selectedJar)
- setDestinationJarPickerShown(false)
- })
- .catch((err) => {
- if (abortCtrl.signal.aborted) return
- setAlert({ variant: 'danger', message: err.message })
- setDestinationJarPickerShown(false)
- })
- }}
- />
- )}
-
-
-
- {t('send.label_source_jar')}
- {!walletInfo || sortedAccountBalances.length === 0 ? (
-
-
-
- ) : (
-
- {sortedAccountBalances.map((it) => (
- 0}
- isSelected={it.accountIndex === sourceJarIndex}
- fillLevel={jarFillLevel(
- it.calculatedTotalBalanceInSats,
- walletInfo.balanceSummary.calculatedTotalBalanceInSats,
- )}
- variant={
- it.accountIndex === sourceJarIndex &&
- isCoinjoin &&
- sourceJarCoinjoinPreconditionSummary?.isFulfilled === false
- ? 'warning'
- : undefined
- }
- onClick={(jarIndex) => setSourceJarIndex(jarIndex)}
- />
- ))}
-
- )}
-
-
- {!isLoading &&
- !isOperationDisabled &&
- isCoinjoin &&
- sourceJarCoinjoinPreconditionSummary?.isFulfilled === false && (
-
-
- )}
-
-
- {t('send.label_recipient')}
-
- {isLoading ? (
-
-
-
- ) : (
- <>
-
{
- const value = e.target.value
- setDestination(value === '' ? null : value)
- }}
- isInvalid={(destination !== null && !isValidAddress(destination)) || destinationIsReusedAddress}
- disabled={isOperationDisabled || destinationJar !== null}
- />
- {destinationIsReusedAddress && (
-
- {t('send.feedback_reused_address')}
-
- )}
- {!destinationIsReusedAddress && (
- {
- if (destinationJar !== null) {
- setDestinationJar(null)
- setDestination(INITIAL_DESTINATION)
- } else {
- setDestinationJarPickerShown(true)
- }
- }}
- disabled={isOperationDisabled}
- >
- {destinationJar !== null ? (
-
-
-
- ) : (
-
-
-
- )}
-
- )}
-
- )}
-
- {isLoading ? (
-
-
-
- ) : (
- <>
-
setAmount(parseInt(e.target.value, 10))}
- isInvalid={amount !== null && !isValidAmount(amount, isSweep)}
- disabled={isSweep || isOperationDisabled}
- />
- setIsSweep((current) => !current)}
- disabled={isOperationDisabled || sourceJarIndex === null}
- >
-
- {isSweep ? (
- <>{t('send.button_clear_sweep')}
- ) : (
- <>
-
- {t('send.button_sweep')}
-
- )}
-
-
-
- )}
+
+ {t('send.text_coinjoin_already_running')}
+
+
+ abortCoinjoin()}
+ >
+
+
+ {t('global.abort')}
+
+
-
-
-
-
- {t('send.fee_breakdown.title', {
- maxCollaboratorFee: estimatedMaxCollaboratorFee
- ? `≤${formatSats(estimatedMaxCollaboratorFee)} sats`
- : '...',
- })}
-
-
- {
- setActiveFeeConfigModalSection('cj_fee')
- setShowFeeConfigModal(true)
- }}
- className="text-decoration-underline link-secondary"
- />
- ),
- }}
- />
-
-
-
- {
- setActiveFeeConfigModalSection('tx_fee')
- setShowFeeConfigModal(true)
- }}
- className="text-decoration-underline link-secondary"
- />
- ),
- }}
- />
-
-
- {accountBalance && (
- {
- setActiveFeeConfigModalSection('cj_fee')
- setShowFeeConfigModal(true)
- }}
- />
- )}
-
- {showFeeConfigModal && (
- reloadFeeConfigValues()}
- onHide={() => setShowFeeConfigModal(false)}
- defaultActiveSectionKey={activeFeeConfigModalSection}
- />
- )}
-
+ )}
+
+
+
+ {maxFeesConfigMissing &&
reloadFeeConfigValues()} />}
+
+ {alert && (
+
+ {alert.message}
+
+ )}
+
+ {paymentSuccessfulInfoAlert && (
+ <>
+
+
+
-
-
-
+
+ {paymentSuccessfulInfoAlert.message}
+
+
+ )}
+
+
+
+ {showConfirmAbortModal && (
+ setShowConfirmAbortModal(false)}
+ onConfirm={() => abortCoinjoin()}
>
- {isSending ? (
-
-
- {t('send.text_sending')}
-
- ) : (
- <>{submitButtonOptions.text}
- )}
-
- {showConfirmAbortModal && (
-
setShowConfirmAbortModal(false)}
- onConfirm={() => abortCoinjoin()}
- >
- {t('send.confirm_abort_modal.text_body')}
-
- )}
- {showConfirmSendModal && (
-
setShowConfirmSendModal(false)}
- onConfirm={() => {
- submitButtonRef.current?.click()
- }}
- data={{
- sourceJarIndex: sourceJarIndex!,
- destination: destination!,
- amount: parseInt(amountFieldValue, 10),
- isSweep,
- isCoinjoin,
- numCollaborators: numCollaborators!,
- feeConfigValues,
- }}
- />
- )}
- {t('settings.fees.description_general_fee_settings')}
- {t('settings.fees.label_tx_fees')}
- {txFeesUnit && (
-
- {
- const value = tab.value as TxFeeValueUnit
- setTxFeesUnit(value)
- if (values.tx_fees) {
- if (value === 'sats/kilo-vbyte') {
- setFieldValue('tx_fees', values.tx_fees * 1_000, false)
- } else {
- setFieldValue('tx_fees', Math.round(values.tx_fees / 1_000), false)
- }
- }
- setTimeout(() => validateForm(), 4)
- }}
- initialValue={txFeesUnit}
- disabled={isSubmitting}
- />
-
- )}
-
- {t(
- txFeesUnit === 'sats/kilo-vbyte'
- ? 'settings.fees.description_tx_fees_satspervbyte'
- : 'settings.fees.description_tx_fees_blocks',
- )}
-
-
-
-
- {txFeesUnit === 'sats/kilo-vbyte' ? (
- <>
- / vB
-
- ) : (
-
- )}
-
-
- {txFeesUnit === 'sats/kilo-vbyte' ? (
- {
- const value = parseFloat(e.target.value)
- setFieldValue('tx_fees', value * 1_000, true)
- }}
- isValid={touched.tx_fees && !errors.tx_fees}
- isInvalid={touched.tx_fees && !!errors.tx_fees}
- min={TX_FEES_SATSPERKILOVBYTE_MIN / 1_000}
- max={TX_FEES_SATSPERKILOVBYTE_MAX / 1_000}
- step={0.001}
- />
- ) : (
- {
- const value = parseInt(e.target.value, 10)
- setFieldValue('tx_fees', value, true)
- }}
- isValid={touched.tx_fees && !errors.tx_fees}
- isInvalid={touched.tx_fees && !!errors.tx_fees}
- min={TX_FEES_BLOCKS_MIN}
- max={TX_FEES_BLOCKS_MAX}
- step={1}
- />
- )}
- {errors.tx_fees}
-
-
+
@@ -361,13 +247,13 @@ export default function FeeConfigModal({
const loadFeeConfigValues = useLoadFeeConfigValues()
const [isLoading, setIsLoading] = useState(true)
const [isSubmitting, setIsSubmitting] = useState(false)
- const [loadError, setLoadError] = useState(false)
+ const [loadError, setLoadError] = useState()
const [saveErrorMessage, setSaveErrorMessage] = useState()
- const [feeFormValues, setFeeFormValues] = useState(null)
+ const [feeFormValues, setFeeFormValues] = useState()
const formRef = useRef>(null)
useEffect(() => {
- setLoadError(false)
+ setLoadError(undefined)
const abortCtrl = new AbortController()
if (show) {
@@ -379,10 +265,10 @@ export default function FeeConfigModal({
setIsLoading(false)
setFeeFormValues(val)
})
- .catch((e) => {
+ .catch((error) => {
if (abortCtrl.signal.aborted) return
setIsLoading(false)
- setLoadError(true)
+ setLoadError(error)
})
} else {
setSaveErrorMessage(undefined)
@@ -393,60 +279,9 @@ export default function FeeConfigModal({
}
}, [show, loadFeeConfigValues])
- const submit = async (feeValues: FeeValues, txFeesUnit: TxFeeValueUnit) => {
- const allValuesPresent = Object.values(feeValues).every((it) => it !== undefined)
- if (!allValuesPresent) return
-
- let adjustedTxFees = feeValues.tx_fees!
- if (txFeesUnit === 'sats/kilo-vbyte') {
- // There is one special case for value `tx_fees`:
- // Users are allowed to specify the value in "sats/vbyte", but this might
- // be interpreted by JM as "targeted blocks". This adaption makes sure
- // that it is in fact closer to what the user actually expects, albeit it
- // can be surprising that the value is slightly different as specified.
- adjustedTxFees = Math.max(adjustedTxFees, TX_FEES_SATSPERKILOVBYTE_ADJUSTED_MIN)
- }
-
- const updates = [
- {
- key: FEE_CONFIG_KEYS.tx_fees,
- value: String(adjustedTxFees),
- },
- {
- key: FEE_CONFIG_KEYS.tx_fees_factor,
- value: String(feeValues.tx_fees_factor),
- },
- {
- key: FEE_CONFIG_KEYS.max_cj_fee_abs,
- value: String(feeValues.max_cj_fee_abs),
- },
- {
- key: FEE_CONFIG_KEYS.max_cj_fee_rel,
- value: String(feeValues.max_cj_fee_rel),
- },
- ]
-
- setSaveErrorMessage(undefined)
- setIsSubmitting(true)
- try {
- await updateConfigValues({ updates })
-
- setIsSubmitting(false)
- onSuccess && onSuccess()
- onHide()
- } catch (err: any) {
- setIsSubmitting(false)
- setSaveErrorMessage((_) =>
- t('settings.fees.error_saving_fee_config_failed', {
- reason: err.message || t('global.errors.reason_unknown'),
- }),
- )
- }
- }
-
const validate = useCallback(
- (values: FeeFormValues, txFeesUnit: TxFeeValueUnit) => {
- const errors = {} as FormikErrors
+ (values: FeeFormValues) => {
+ const errors = {} as FormikErrors
if (values.enableValidation === false) {
// do not validate form to enable resetting the values
@@ -465,32 +300,9 @@ export default function FeeConfigModal({
})
}
- if (txFeesUnit === 'sats/kilo-vbyte') {
- if (
- !isValidNumber(values.tx_fees) ||
- values.tx_fees! < TX_FEES_SATSPERKILOVBYTE_MIN ||
- values.tx_fees! > TX_FEES_SATSPERKILOVBYTE_MAX
- ) {
- errors.tx_fees = t('settings.fees.feedback_invalid_tx_fees_satspervbyte', {
- min: (TX_FEES_SATSPERKILOVBYTE_MIN / 1_000).toLocaleString(undefined, {
- maximumFractionDigits: Math.log10(1_000),
- }),
- max: (TX_FEES_SATSPERKILOVBYTE_MAX / 1_000).toLocaleString(undefined, {
- maximumFractionDigits: Math.log10(1_000),
- }),
- })
- }
- } else {
- if (
- !isValidNumber(values.tx_fees) ||
- values.tx_fees! < TX_FEES_BLOCKS_MIN ||
- values.tx_fees! > TX_FEES_BLOCKS_MAX
- ) {
- errors.tx_fees = t('settings.fees.feedback_invalid_tx_fees_blocks', {
- min: TX_FEES_BLOCKS_MIN.toLocaleString(),
- max: TX_FEES_BLOCKS_MAX.toLocaleString(),
- })
- }
+ const txFeeErrors = validateTxFee(values.tx_fees, t)
+ if (txFeeErrors.value) {
+ errors.tx_fees = txFeeErrors.value
}
if (
@@ -519,6 +331,44 @@ export default function FeeConfigModal({
[t],
)
+ const submit = async (values: FeeFormValues) => {
+ const updates = [
+ {
+ key: FEE_CONFIG_KEYS.tx_fees,
+ value: String(values.tx_fees?.value ?? ''),
+ },
+ {
+ key: FEE_CONFIG_KEYS.tx_fees_factor,
+ value: String(values.tx_fees_factor ?? ''),
+ },
+ {
+ key: FEE_CONFIG_KEYS.max_cj_fee_abs,
+ value: String(values.max_cj_fee_abs ?? ''),
+ },
+ {
+ key: FEE_CONFIG_KEYS.max_cj_fee_rel,
+ value: String(values.max_cj_fee_rel ?? ''),
+ },
+ ]
+
+ setSaveErrorMessage(undefined)
+ setIsSubmitting(true)
+ try {
+ await updateConfigValues({ updates })
+
+ setIsSubmitting(false)
+ onSuccess && onSuccess()
+ onHide()
+ } catch (err: any) {
+ setIsSubmitting(false)
+ setSaveErrorMessage((_) =>
+ t('settings.fees.error_saving_fee_config_failed', {
+ reason: err.message || t('global.errors.reason_unknown'),
+ }),
+ )
+ }
+ }
+
const cancel = useCallback(() => {
onCancel && onCancel()
onHide()
@@ -601,10 +451,10 @@ export default function FeeConfigModal({
variant="outline-dark"
className="position-relative"
onClick={() => {
- formRef.current?.setFieldValue('max_cj_fee_abs', '', false)
- formRef.current?.setFieldValue('max_cj_fee_rel', '', false)
- formRef.current?.setFieldValue('tx_fees', '', false)
- formRef.current?.setFieldValue('tx_fees_factor', '', false)
+ formRef.current?.setFieldValue('max_cj_fee_abs', undefined, false)
+ formRef.current?.setFieldValue('max_cj_fee_rel', undefined, false)
+ formRef.current?.setFieldValue('tx_fees', undefined, false)
+ formRef.current?.setFieldValue('tx_fees_factor', undefined, false)
setTimeout(() => formRef.current?.validateForm(), 4)
}}
disabled={isLoading || isSubmitting}
diff --git a/src/components/settings/TxFeeInputField.tsx b/src/components/settings/TxFeeInputField.tsx
new file mode 100644
index 000000000..344d68ed4
--- /dev/null
+++ b/src/components/settings/TxFeeInputField.tsx
@@ -0,0 +1,196 @@
+import * as rb from 'react-bootstrap'
+import { useTranslation } from 'react-i18next'
+import { TFunction } from 'i18next'
+import { FieldProps, FormikErrors } from 'formik'
+import { TxFeeValueUnit, TxFee } from '../../hooks/Fees'
+import { isValidNumber } from '../../utils'
+import Sprite from '../Sprite'
+import SegmentedTabs from '../SegmentedTabs'
+
+type SatsPerKiloVByte = number
+
+const TX_FEES_BLOCKS_MIN = 1
+const TX_FEES_BLOCKS_MAX = 1_000
+
+const TX_FEES_SATSPERKILOVBYTE_MIN: SatsPerKiloVByte = 1_001 // actual min of `tx_fees` if unit is sats/kilo-vbyte
+// 350 sats/vbyte - no enforcement by JM - this should be a "sane" max value (taken default value of "absurd_fee_per_kb")
+const TX_FEES_SATSPERKILOVBYTE_MAX: SatsPerKiloVByte = 350_000
+
+const adjustTxFees = (val: TxFee) => {
+ if (val.unit === 'sats/kilo-vbyte') {
+ // There is one special case for value `tx_fees`:
+ // Users are allowed to specify the value in "sats/vbyte", but this might
+ // be interpreted by JM as "targeted blocks". This adaption makes sure
+ // that it is in fact closer to what the user actually expects, albeit it
+ // can be surprising that the value is slightly different as specified.
+ return {
+ ...val,
+ value: Math.max(val.value, TX_FEES_SATSPERKILOVBYTE_MIN),
+ }
+ }
+ return val
+}
+
+export const validateTxFee = (val: TxFee | undefined, t: TFunction): FormikErrors => {
+ const errors = {} as FormikErrors
+
+ if (val?.unit === 'sats/kilo-vbyte') {
+ if (
+ !isValidNumber(val.value) ||
+ val.value < TX_FEES_SATSPERKILOVBYTE_MIN ||
+ val.value > TX_FEES_SATSPERKILOVBYTE_MAX
+ ) {
+ errors.value = t('settings.fees.feedback_invalid_tx_fees_satspervbyte', {
+ min: (TX_FEES_SATSPERKILOVBYTE_MIN / 1_000).toLocaleString(undefined, {
+ maximumFractionDigits: Math.log10(1_000),
+ }),
+ max: (TX_FEES_SATSPERKILOVBYTE_MAX / 1_000).toLocaleString(undefined, {
+ maximumFractionDigits: Math.log10(1_000),
+ }),
+ })
+ }
+ } else {
+ if (!isValidNumber(val?.value) || val?.value! < TX_FEES_BLOCKS_MIN || val?.value! > TX_FEES_BLOCKS_MAX) {
+ errors.value = t('settings.fees.feedback_invalid_tx_fees_blocks', {
+ min: TX_FEES_BLOCKS_MIN.toLocaleString(),
+ max: TX_FEES_BLOCKS_MAX.toLocaleString(),
+ })
+ }
+ }
+
+ return errors
+}
+
+type TxFeeInputFieldProps = FieldProps & {
+ label: string
+}
+
+export const TxFeeInputField = ({ field, form, label }: TxFeeInputFieldProps) => {
+ const { t } = useTranslation()
+
+ return (
+ <>
+ {label}
+
+
+ {
+ const unit = tab.value as TxFeeValueUnit
+
+ if (field.value) {
+ if (unit === 'sats/kilo-vbyte') {
+ form.setFieldValue(
+ field.name,
+ adjustTxFees({
+ value: Math.round(field.value.value * 1_000),
+ unit,
+ }),
+ true,
+ )
+ } else {
+ form.setFieldValue(
+ field.name,
+ adjustTxFees({
+ value: Math.round(field.value.value / 1_000),
+ unit,
+ }),
+ true,
+ )
+ }
+ }
+ }}
+ initialValue={field.value?.unit || 'blocks'}
+ disabled={form.isSubmitting}
+ />
+
+
+ {t(
+ field.value?.unit === 'sats/kilo-vbyte'
+ ? 'settings.fees.description_tx_fees_satspervbyte'
+ : 'settings.fees.description_tx_fees_blocks',
+ )}
+
+
+
+
+ {field.value?.unit === 'sats/kilo-vbyte' ? (
+ <>
+ / vB
+
+ ) : (
+
+ )}
+
+
+ {field.value?.unit === 'sats/kilo-vbyte' ? (
+ {
+ const value = parseFloat(e.target.value)
+ form.setFieldValue(
+ field.name,
+ adjustTxFees({
+ value: Math.round(value * 1_000),
+ unit: 'sats/kilo-vbyte',
+ }),
+ true,
+ )
+ }}
+ isValid={form.touched[field.name] && !form.errors[field.name]}
+ isInvalid={form.touched[field.name] && !!form.errors[field.name]}
+ min={TX_FEES_SATSPERKILOVBYTE_MIN / 1_000}
+ max={TX_FEES_SATSPERKILOVBYTE_MAX / 1_000}
+ step={0.001}
+ />
+ ) : (
+ {
+ const value = parseInt(e.target.value, 10)
+ form.setFieldValue(
+ field.name,
+ adjustTxFees({
+ value,
+ unit: 'blocks',
+ }),
+ true,
+ )
+ }}
+ isValid={form.touched[field.name] && !form.errors[field.name]}
+ isInvalid={form.touched[field.name] && !!form.errors[field.name]}
+ min={TX_FEES_BLOCKS_MIN}
+ max={TX_FEES_BLOCKS_MAX}
+ step={1}
+ />
+ )}
+ {form.errors[field.name]}
+
+
+
+ )
+}
diff --git a/src/constants/features.ts b/src/constants/features.ts
index 236fc6c39..c3fb168d1 100644
--- a/src/constants/features.ts
+++ b/src/constants/features.ts
@@ -3,11 +3,13 @@ import { ServiceInfo } from '../context/ServiceInfoContext'
interface Features {
importWallet: SemVer
rescanChain: SemVer
+ directSendTxFee: SemVer
}
const features: Features = {
importWallet: { major: 0, minor: 9, patch: 10 }, // added in https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/1461
rescanChain: { major: 0, minor: 9, patch: 10 }, // added in https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/1461
+ directSendTxFee: { major: 0, minor: 9, patch: 10 }, // added in https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/1597
}
type Feature = keyof Features
diff --git a/src/hooks/Fees.ts b/src/hooks/Fees.ts
index e4fe61a2d..28d7b3054 100644
--- a/src/hooks/Fees.ts
+++ b/src/hooks/Fees.ts
@@ -4,8 +4,13 @@ import { AmountSats } from '../libs/JmWalletApi'
import { isValidNumber } from '../utils'
export type TxFeeValueUnit = 'blocks' | 'sats/kilo-vbyte'
+export type TxFeeValue = number
+export type TxFee = {
+ value: TxFeeValue
+ unit: TxFeeValueUnit
+}
-export const toTxFeeValueUnit = (val?: number): TxFeeValueUnit | undefined => {
+export const toTxFeeValueUnit = (val?: TxFeeValue): TxFeeValueUnit | undefined => {
if (val === undefined || !Number.isInteger(val) || val < 1) return undefined
return val <= 1_000 ? 'blocks' : 'sats/kilo-vbyte'
}
@@ -18,7 +23,7 @@ export const FEE_CONFIG_KEYS = {
}
export interface FeeValues {
- tx_fees?: number
+ tx_fees?: TxFee
tx_fees_factor?: number
max_cj_fee_abs?: number
max_cj_fee_rel?: number
@@ -42,7 +47,12 @@ export const useLoadFeeConfigValues = () => {
const parsedMaxFeeRel = parseFloat(policy.max_cj_fee_rel || '')
const feeValues: FeeValues = {
- tx_fees: isValidNumber(parsedTxFees) ? parsedTxFees : undefined,
+ tx_fees: isValidNumber(parsedTxFees)
+ ? {
+ value: parsedTxFees,
+ unit: toTxFeeValueUnit(parsedTxFees) || 'blocks',
+ }
+ : undefined,
tx_fees_factor: isValidNumber(parsedTxFeesFactor) ? parsedTxFeesFactor : undefined,
max_cj_fee_abs: isValidNumber(parsedMaxFeeAbs) ? parsedMaxFeeAbs : undefined,
max_cj_fee_rel: isValidNumber(parsedMaxFeeRel) ? parsedMaxFeeRel : undefined,
diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
index 423c6dcbd..dff6d5092 100644
--- a/src/i18n/locales/en/translation.json
+++ b/src/i18n/locales/en/translation.json
@@ -280,6 +280,8 @@
"text_coinjoin_already_running": "A collaborative transaction is currently in progress.",
"label_recipient": "Recipient",
"placeholder_recipient": "Enter address or choose jar from wallet...",
+ "feedback_invalid_source_jar": "Please select a jar to send from.",
+ "feedback_invalid_destination_address": "Please enter valid a destination address.",
"feedback_reused_address": "This address is already used. To preserve your privacy please choose another one.",
"label_source_jar": "Send from",
"title_jar_selector": "Select a jar from your wallet to send the funds to.",
diff --git a/src/index.css b/src/index.css
index ef2b62471..077dfffa3 100644
--- a/src/index.css
+++ b/src/index.css
@@ -345,11 +345,14 @@ main {
text-align: justify;
}
+.cursor-not-allowed {
+ cursor: not-allowed !important;
+}
.cursor-pointer {
- cursor: pointer;
+ cursor: pointer !important;
}
.cursor-wait {
- cursor: wait;
+ cursor: wait !important;
}
/* Fullscreen Overlays */
@@ -555,7 +558,6 @@ h2 {
}
/* Wallets Styles */
-
.wallets a.wallet-name {
text-decoration: none;
color: var(--bs-body-color);
@@ -565,14 +567,7 @@ h2 {
text-decoration: underline;
}
-.wallets .btn.btn-outline-dark:not(:hover) {
- border-color: rgba(222, 222, 222, 1);
-}
-:root[data-theme='dark'] .wallets .btn.btn-outline-dark:not(:hover) {
- border-color: var(--bs-gray-800);
-}
/* Alpha Warning */
-
.warning-card-wrapper {
position: fixed;
height: 100%;
@@ -663,29 +658,37 @@ h2 {
:root[data-theme='dark'] .btn:not(.btn-light) {
--bs-btn-color: var(--bs-white);
}
-
-:root[data-theme='dark'] .btn-dark {
- background-color: var(--bs-gray-800);
- border-color: var(--bs-gray-800);
-}
-
:root[data-theme='dark'] .input-group-text {
background-color: var(--bs-gray-800);
}
-:root[data-theme='dark'] .btn-dark:hover {
- background-color: var(--bs-gray-dark);
- border-color: var(--bs-gray-dark) !important;
+:root[data-theme='dark'] .btn-dark {
+ --bs-btn-color: var(--bs-light);
+ --bs-btn-bg: var(--bs-gray-800);
+ --bs-btn-border-color: var(--bs-btn-bg);
+ --bs-btn-hover-bg: var(--bs-gray-dark);
+ --bs-btn-hover-border-color: var(--bs-btn-hover-bg);
+ --bs-btn-active-color: #fff;
+ --bs-btn-active-bg: var(--bs-btn-hover-bg);
+ --bs-btn-active-border-color: var(--bs-btn-active-bg);
+ --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+ --bs-btn-disabled-color: var(--bs-light);
+ --bs-btn-disabled-bg: transparent;
+ --bs-btn-disabled-border-color: var(--bs-btn-border-color);
}
:root[data-theme='dark'] .btn-outline-dark {
- color: var(--bs-white);
- border-color: var(--bs-gray-800);
-}
-
-:root[data-theme='dark'] .btn-outline-dark:hover {
- background-color: var(--bs-gray-dark) !important;
- border-color: var(--bs-gray-dark) !important;
+ --bs-btn-color: var(--bs-light);
+ --bs-btn-border-color: var(--bs-gray-800);
+ --bs-btn-hover-bg: var(--bs-gray-dark);
+ --bs-btn-hover-border-color: var(--bs-btn-hover-bg);
+ --bs-btn-active-color: #fff;
+ --bs-btn-active-bg: var(--bs-btn-hover-bg);
+ --bs-btn-active-border-color: var(--bs-btn-active-bg);
+ --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+ --bs-btn-disabled-color: var(--bs-light);
+ --bs-btn-disabled-bg: transparent;
+ --bs-btn-disabled-border-color: var(--bs-btn-border-color);
}
:root[data-theme='dark'] .offcanvas {
@@ -693,7 +696,7 @@ h2 {
}
:root[data-theme='dark'] .spinner-border {
- border-color: var(--bs-white) !important;
+ border-color: var(--bs-light) !important;
border-right-color: transparent !important;
}
@@ -706,13 +709,14 @@ h2 {
}
:root[data-theme='dark'] .form-control {
+ background-color: var(--bs-light);
color: var(--bs-body-bg);
- background-color: var(--bs-white);
}
:root[data-theme='dark'] .form-control:disabled,
:root[data-theme='dark'] .form-select:disabled,
-.form-control[readonly] {
+:root[data-theme='dark'] .form-control[readonly] {
+ --bs-border-color: var(--bs-gray-500);
background-color: var(--bs-gray-500);
}
@@ -721,15 +725,15 @@ h2 {
}
:root[data-theme='dark'] .link-dark {
- color: var(--bs-white) !important;
- text-decoration-color: RGBA(var(--bs-white), var(--bs-link-underline-opacity, 1)) !important;
+ color: var(--bs-light) !important;
+ text-decoration-color: rgba(var(--bs-light), var(--bs-link-underline-opacity, 1)) !important;
}
:root[data-theme='dark'] .toast {
background-color: transparent;
}
:root[data-theme='dark'] .toast-header {
- color: var(--bs-white);
+ color: var(--bs-light);
background-color: var(--bs-gray-800);
border-color: var(--bs-gray-900);
}
diff --git a/src/libs/JmWalletApi.ts b/src/libs/JmWalletApi.ts
index ca85ae7a3..c28b26f4d 100644
--- a/src/libs/JmWalletApi.ts
+++ b/src/libs/JmWalletApi.ts
@@ -112,6 +112,7 @@ interface DirectSendRequest {
mixdepth: Mixdepth
destination: BitcoinAddress
amount_sats: AmountSats
+ txfee?: number
}
interface DoCoinjoinRequest {
@@ -390,7 +391,10 @@ const postDirectSend = async ({ token, signal, walletFileName }: WalletRequestCo
return await fetch(`${basePath()}/v1/wallet/${encodeURIComponent(walletFileName)}/taker/direct-send`, {
method: 'POST',
headers: { ...Helper.buildAuthHeader(token) },
- body: JSON.stringify(req),
+ body: JSON.stringify({
+ ...req,
+ txfee: req.txfee ? String(req.txfee) : undefined,
+ }),
signal,
})
}