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.

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

Deploy to prod #632

Merged
merged 4 commits into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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 24
versionName "0.4.25"
versionCode 25
versionName "0.4.26"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mutiny-wallet",
"version": "0.4.25",
"version": "0.4.26",
"license": "MIT",
"packageManager": "[email protected]",
"scripts": {
Expand Down Expand Up @@ -55,7 +55,7 @@
"@kobalte/tailwindcss": "^0.5.0",
"@modular-forms/solid": "^0.18.1",
"@mutinywallet/barcode-scanner": "5.0.0-beta.3",
"@mutinywallet/mutiny-wasm": "0.4.25",
"@mutinywallet/mutiny-wasm": "0.4.26",
"@mutinywallet/waila-wasm": "^0.2.1",
"@nostr-dev-kit/ndk": "^0.8.11",
"@solid-primitives/upload": "^0.0.111",
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions src/components/AmountEditable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -696,16 +696,15 @@ export const AmountEditable: ParentComponent<{
<InlineAmount amount={maxOrLocalSats()} />
</Show>
<img src={pencil} alt="Edit" />
{/* {props.children} */}
</button>
<Dialog.Portal>
{/* <Dialog.Overlay class={OVERLAY} /> */}
<div class={DIALOG_POSITIONER}>
<Dialog.Content
class={DIALOG_CONTENT}
// Should always be on top, even when nested in other dialogs
classList={{ "z-50": true }}
onEscapeKeyDown={handleClose}
>
{/* TODO: figure out how to submit on enter */}
<div class="flex w-full justify-end">
<button
onClick={handleClose}
Expand All @@ -715,7 +714,6 @@ export const AmountEditable: ParentComponent<{
<img src={close} alt="Close" />
</button>
</div>
{/* <form onSubmit={handleSubmit} class="text-black"> */}
<form
onSubmit={handleSubmit}
class="absolute -z-10 opacity-0"
Expand Down
6 changes: 6 additions & 0 deletions src/components/ChooseCurrency.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ export const FIAT_OPTIONS: Currency[] = [
hasSymbol: "₤",
maxFractionalDigits: 2
},
{
label: "Australia Dollar AUD",
value: "AUD",
hasSymbol: "$",
maxFractionalDigits: 2
},
{
label: "Japanese Yen JPY",
value: "JPY",
Expand Down
2 changes: 1 addition & 1 deletion src/routes/settings/Plus.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ function PlusCTA() {

await state.mutiny_wallet?.pay_subscription_invoice(
invoice?.bolt11,
false // todo add flag for auto-pay
true
);

await vibrateSuccess();
Expand Down