Skip to content
This repository was archived by the owner on Oct 2, 2023. It is now read-only.

Fix fee slider #52

Open
AaronDewes wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix fee slider #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6999bc3
Fix fee slider
AaronDewes Aug 24, 2022
09d450b
Run linter
AaronDewes Aug 24, 2022
6c1edd8
Fix yarn version
AaronDewes Aug 24, 2022
409efbd
Revert change
AaronDewes Aug 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
785 changes: 0 additions & 785 deletions .yarn/releases/yarn-3.2.0.cjs
View file
Open in desktop

This file was deleted.

783 changes: 783 additions & 0 deletions .yarn/releases/yarn-3.2.2.cjs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.2.0.cjs
yarnPath: .yarn/releases/yarn-3.2.2.cjs
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ WORKDIR /app

# Copy dependency management files
COPY .yarnrc.yml yarn.lock package.json ./
COPY .yarn/releases/yarn-3.2.0.cjs /app/.yarn/releases/yarn-3.2.0.cjs
COPY .yarn/releases/yarn-3.2.2.cjs /app/.yarn/releases/yarn-3.2.2.cjs
# Install dependencies
RUN yarn install

Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@
"postinstall": "husky install"
},
"dependencies": {
"@aarondewes/vue-slider-component": "^3.2.16",
"@bitcoin-design/bitcoin-icons-vue": "^0.1.9",
"@runcitadel/sdk": "^0.5.2",
"@vue/compat": "^3.2.31",
"@vue/compat": "^3.2.37",
"bignumber.js": "^9.0.2",
"bootstrap": "^5.1.3",
"bootstrap": "^5.2.0",
"bootstrap-vue": "https://github.com/bootstrap-vue/bootstrap-vue.git#vue3-compat-build",
"bootstrap-vue-upstream": "npm:bootstrap-vue@2.22.0",
"buffer": "^6.0.3",
Expand All @@ -33,6 +32,7 @@
"vue-confetti": "^2.3.0",
"vue-i18n": "^v9.2.0-beta.36",
"vue-router": "^4.0.13",
"vue-slider-component": "4.1.0-beta.2",
"vue-toastification": "next"
},
"devDependencies": {
Expand All @@ -55,7 +55,7 @@
"not dead",
"not ie 11"
],
"packageManager": "yarn@3.2.0",
"packageManager": "yarn@3.2.2",
"resolutions": {
"portal-vue": "^3.0.0-beta.0"
}
Expand Down
36 changes: 25 additions & 11 deletions src/components/BitcoinWallet.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,11 @@
<span v-if="tx.type === 'incoming'">+</span>
<span v-else-if="tx.type === 'outgoing'">-</span>
{{
$filters.localize($filters.unit(tx.amount, systemStore)?.toString() as string)
$filters.localize(
$filters
.unit(tx.amount, systemStore)
?.toString() as string,
)
}}
</span>
<small class="text-muted">{{
Expand Down Expand Up @@ -345,7 +349,11 @@
<div class="text-center pb-4">
<h3 class="mb-0">
{{
$filters.localize($filters.unit(withdraw.amount, systemStore)?.toString() as string)
$filters.localize(
$filters
.unit(withdraw.amount, systemStore)
?.toString() as string,
)
}}
</h3>
<span class="d-block mb-1 text-muted">
Expand Down Expand Up @@ -404,7 +412,9 @@
<span class="text-end text-muted">
<b>{{
$filters.localize(
$filters.unit(projectedBalanceInSats, systemStore)?.toString() as string
$filters
.unit(projectedBalanceInSats, systemStore)
?.toString() as string,
)
}}</b>
<small>&nbsp;{{ $filters.formatUnit(systemStore.unit) }}</small>
Expand All @@ -417,12 +427,12 @@
<b>
{{
$filters.localize(
$filters.unit(
bitcoinStore.fees[withdraw.selectedFee.type][
"total"
],
systemStore
)?.toString() as string
$filters
.unit(
bitcoinStore.fees[withdraw.selectedFee.type]['total'],
systemStore,
)
?.toString() as string,
)
}}
</b>
Expand All @@ -442,7 +452,9 @@
<span class="text-end text-muted">
<b>{{
$filters.localize(
$filters.unit(projectedBalanceInSats, systemStore)?.toString() as string
$filters
.unit(projectedBalanceInSats, systemStore)
?.toString() as string,
)
}}</b>
<small>&nbsp;{{ $filters.formatUnit(systemStore.unit) }}</small>
Expand Down Expand Up @@ -492,7 +504,9 @@
<b>
{{
$filters.localize(
$filters.unit(withdraw.amount, systemStore)?.toString() as string
$filters
.unit(withdraw.amount, systemStore)
?.toString() as string,
)
}}
{{ $filters.formatUnit(systemStore.unit) }}
Expand Down
4 changes: 2 additions & 2 deletions src/components/Channels/Channel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"
>{{
$filters.localize(
$filters.unit(channel.localBalance, systemStore) as number
$filters.unit(channel.localBalance, systemStore) as number,
)
}}
{{ $filters.formatUnit(systemStore.unit) }}</span
Expand All @@ -57,7 +57,7 @@
class="text-success text-end font-weight-bold"
>{{
$filters.localize(
$filters.unit(channel.remoteBalance, systemStore) as number
$filters.unit(channel.remoteBalance, systemStore) as number,
)
}}
{{ $filters.formatUnit(systemStore.unit) }}</span
Expand Down
34 changes: 28 additions & 6 deletions src/components/Channels/Manage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
$filters.satsToUSD(channel.localBalance, bitcoinStore).toString()
"
>
{{ $filters.localize($filters.unit(channel.localBalance, systemStore) as number) }}
{{
$filters.localize(
$filters.unit(channel.localBalance, systemStore) as number,
)
}}
{{ $filters.formatUnit(systemStore.unit) }}
</h4>
<h4
Expand All @@ -19,7 +23,11 @@
$filters.satsToUSD(channel.remoteBalance, bitcoinStore).toString()
"
>
{{ $filters.localize($filters.unit(channel.remoteBalance, systemStore) as number) }}
{{
$filters.localize(
$filters.unit(channel.remoteBalance, systemStore) as number,
)
}}
{{ $filters.formatUnit(systemStore.unit) }}
</h4>
</div>
Expand Down Expand Up @@ -81,7 +89,11 @@
"
class="text-capitalize font-weight-bold"
>
{{ $filters.localize($filters.unit(channel.localBalance, systemStore) as number) }}
{{
$filters.localize(
$filters.unit(channel.localBalance, systemStore) as number,
)
}}
{{ $filters.formatUnit(systemStore.unit) }}
</span>
</div>
Expand All @@ -95,7 +107,11 @@
"
class="text-capitalize font-weight-bold"
>
{{ $filters.localize($filters.unit(channel.remoteBalance, systemStore) as number) }}
{{
$filters.localize(
$filters.unit(channel.remoteBalance, systemStore) as number,
)
}}
{{ $filters.formatUnit(systemStore.unit) }}
</span>
</div>
Expand All @@ -110,7 +126,9 @@
class="text-capitalize font-weight-bold"
>
{{
$filters.localize($filters.unit(channel.capacity, systemStore) as number)
$filters.localize(
$filters.unit(channel.capacity, systemStore) as number,
)
}}
{{ $filters.formatUnit(systemStore.unit) }}
</span>
Expand All @@ -132,7 +150,11 @@
>
<span class="text-muted">Commit Fee</span>
<span class="text-capitalize font-weight-bold">
{{ $filters.localize($filters.unit(channel.commitFee, systemStore) as number) }}
{{
$filters.localize(
$filters.unit(channel.commitFee, systemStore) as number,
)
}}
{{ $filters.formatUnit(systemStore.unit) }}
</span>
</div>
Expand Down
53 changes: 43 additions & 10 deletions src/components/LightningWallet.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,9 @@
<span v-else-if="tx.type === 'outgoing'">-</span>
{{
$filters.localize(
$filters.unit(tx.amount, systemStore)?.toString() as string
$filters
.unit(tx.amount, systemStore)
?.toString() as string,
)
}}
</span>
Expand Down Expand Up @@ -313,7 +315,9 @@
<small class="d-block text-muted mb-1">Paying</small>
<h4 class="d-block mb-0">
{{
$filters.localize($filters.unit(send.amount, systemStore) as number)
$filters.localize(
$filters.unit(send.amount, systemStore) as number,
)
}}
</h4>
<small class="d-block text-muted">
Expand Down Expand Up @@ -367,9 +371,14 @@
<!-- Invoice amount + description -->
<p class="text-center mb-4 pb-1">
Paid
<b
>{{ $filters.localize($filters.unit(send.amount?.toString() as string, systemStore) as number) }}</b
>
<b>{{
$filters.localize(
$filters.unit(
send.amount?.toString() as string,
systemStore,
) as number,
)
}}</b>
{{ $filters.formatUnit(systemStore.unit) }}
<span v-if="send.description">
for
Expand Down Expand Up @@ -496,7 +505,12 @@
<!-- {{ $filters.localize($filters.unit(receive.amount)) }} -->
<b>
{{
$filters.localize($filters.unit(receive.amount as number, systemStore) as number)
$filters.localize(
$filters.unit(
receive.amount as number,
systemStore,
) as number,
)
}}
{{ $filters.formatUnit(systemStore.unit) }}
</b>
Expand Down Expand Up @@ -565,7 +579,12 @@
Received
<b
>{{
$filters.localize($filters.unit(receive.amount as number, systemStore) as number)
$filters.localize(
$filters.unit(
receive.amount as number,
systemStore,
) as number,
)
}}
{{ $filters.formatUnit(systemStore.unit) }}</b
>
Expand Down Expand Up @@ -615,7 +634,14 @@
<p class="text-center mb-2">
Paid
<b>
{{ $filters.localize($filters.unit(paymentInfo.amount as number, systemStore) as number) }}
{{
$filters.localize(
$filters.unit(
paymentInfo.amount as number,
systemStore,
) as number,
)
}}
{{ $filters.formatUnit(systemStore.unit) }}
</b>
<span v-if="paymentInfo.description">
Expand All @@ -631,7 +657,12 @@
<small class="text-muted">
Fee:
{{
$filters.localize($filters.unit(paymentInfo.fee as number, systemStore) as number)
$filters.localize(
$filters.unit(
paymentInfo.fee as number,
systemStore,
) as number,
)
}}
{{ $filters.formatUnit(systemStore.unit) }}
</small>
Expand Down Expand Up @@ -685,7 +716,9 @@
<br />
<small class="text-muted"
>Expired on
{{ getReadableTime(expiredInvoice.expiresOn as number | Date) }}</small
{{
getReadableTime(expiredInvoice.expiresOn as number | Date)
}}</small
>
</p>
</div>
Expand Down
12 changes: 5 additions & 7 deletions src/components/Utility/FeeSelector.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
class="d-flex align-items-center"
size="sm"
switch
:disabled="isDisabled"
>
<small class="text-muted ms-1">Custom</small>
</b-form-checkbox>
Expand All @@ -22,8 +21,7 @@
:interval="1"
:dot-size="[22, 22]"
contained
:tooltip="isDisabled ? 'none' : 'always'"
:disabled="isDisabled"
tooltip="always"
@change="emitValue"
>
<template #tooltip="{value, focus}">
Expand Down Expand Up @@ -60,7 +58,7 @@
v-model="chosenFee"
absorb
marks
:vdata="recommendedFees"
:data="recommendedFees"
:dot-size="[22, 22]"
contained
:tooltip="isDisabled ? 'none' : 'always'"
Expand Down Expand Up @@ -93,8 +91,8 @@
</template>

<script lang="ts">
import VueSlider from '@aarondewes/vue-slider-component';
import '@aarondewes/vue-slider-component/theme/default.css';
import VueSlider from 'vue-slider-component';
import 'vue-slider-component/theme/default.css';
import {defineComponent} from 'vue';
import useBitcoinStore from '../../store/bitcoin';

Expand Down Expand Up @@ -230,7 +228,7 @@ $stepBgColor: rgba(0, 0, 0, 0.1) !default;
$labelFontSize: 0.8rem;

/* import theme style */
@import 'node_modules/@aarondewes/vue-slider-component/lib/theme/default.scss';
@import 'node_modules/vue-slider-component/lib/theme/default.scss';

.vue-slider-container {
padding-top: 3rem;
Expand Down
6 changes: 5 additions & 1 deletion src/views/Lightning.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,11 @@
>failed</span
>
at
{{ getReadableTime(systemStore.backupStatus.timestamp as number) }}
{{
getReadableTime(
systemStore.backupStatus.timestamp as number,
)
}}
</small>
</div>
</b-dropdown-group>
Expand Down
Loading