Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prod v0.4.27-1 #650

Merged
merged 3 commits into from
Oct 31, 2023
Merged

Prod v0.4.27-1 #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fca28d
Fix activity items with no fees
TonyGiorgio Oct 31, 2023
159c08b
make sure we've loaded data before showing details
futurepaul Oct 31, 2023
905f18f
Update to v0.4.27-1
TonyGiorgio Oct 31, 2023
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
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "com.mutinywallet.mutinywallet"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 26
versionName "0.4.27"
versionCode 27
versionName "0.4.27-1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mutiny-wallet",
"version": "0.4.27",
"version": "0.4.27-1",
"license": "MIT",
"packageManager": "[email protected]",
"scripts": {
Expand Down
102 changes: 56 additions & 46 deletions src/components/ActivityDetailsModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ function LightningDetails(props: { info: MutinyInvoice; tags?: TagItem }) {
<ul class="flex flex-col gap-4">
<KeyValue key={i18n.t("activity.transaction_details.fee")}>
<ActivityAmount
amount={props.info.fees_paid!.toString()}
amount={props.info.fees_paid?.toString() || "0"}
price={state.price}
/>
</KeyValue>
Expand Down Expand Up @@ -536,56 +536,66 @@ export function ActivityDetailsModal(props: {
</div>
<Dialog.Title>
<FancyCard>
<Switch>
<Match
when={kind() === "Lightning"}
>
<LightningHeader
info={
data() as MutinyInvoice
<Show when={data.latest}>
<Switch>
<Match
when={
kind() === "Lightning"
}
/>
</Match>
<Match
when={
kind() === "OnChain" ||
kind() === "ChannelOpen" ||
kind() === "ChannelClose"
}
>
<OnchainHeader
info={data() as OnChainTx}
kind={kind()}
/>
</Match>
</Switch>
>
<LightningHeader
info={
data() as MutinyInvoice
}
/>
</Match>
<Match
when={
kind() === "OnChain" ||
kind() ===
"ChannelOpen" ||
kind() ===
"ChannelClose"
}
>
<OnchainHeader
info={
data() as OnChainTx
}
kind={kind()}
/>
</Match>
</Switch>
</Show>
</FancyCard>
</Dialog.Title>
<Hr />
<Switch>
<Match when={kind() === "Lightning"}>
<LightningDetails
info={data() as MutinyInvoice}
tags={tags()}
/>
</Match>
<Match
when={
kind() === "OnChain" ||
kind() === "ChannelOpen"
}
>
<OnchainDetails
info={data() as OnChainTx}
kind={kind()}
tags={tags()}
/>
</Match>
<Match when={kind() === "ChannelClose"}>
<ChannelCloseDetails
info={data() as ChannelClosure}
/>
</Match>
<Show when={data.latest}>
<Match when={kind() === "Lightning"}>
<LightningDetails
info={data() as MutinyInvoice}
tags={tags()}
/>
</Match>
<Match
when={
kind() === "OnChain" ||
kind() === "ChannelOpen"
}
>
<OnchainDetails
info={data() as OnChainTx}
kind={kind()}
tags={tags()}
/>
</Match>
<Match when={kind() === "ChannelClose"}>
<ChannelCloseDetails
info={data() as ChannelClosure}
/>
</Match>
</Show>
</Switch>
</div>
</Suspense>
Expand Down
Loading