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 1.8 #1296

Merged
merged 11 commits into from
Sep 4, 2024
Merged

Prod 1.8 #1296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6b292de
fix: search template is missing translations references
martinbarilik Jul 16, 2024
6ab8021
Fedimint resync
benthecarman Jul 11, 2024
1aaf264
improve resync display, warn when navigating away
futurepaul Jul 12, 2024
67674c0
add a polling interval and a done state
futurepaul Jul 12, 2024
281d874
Bump mutiny-wasm
benthecarman Aug 7, 2024
261cf98
add safe mode button to emergency kit
futurepaul Aug 8, 2024
6fbd9f8
bump app verisons
benthecarman Aug 8, 2024
8ebce65
add shutdown popup warning
futurepaul Aug 19, 2024
187932e
remove sentry
futurepaul Aug 19, 2024
dbfb828
hide voltage option for new wallets
futurepaul Sep 3, 2024
71d1bed
Bump to 1.8.0
TonyGiorgio Sep 3, 2024
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
3 changes: 0 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,3 @@ dev-dist
/playwright/.cache/

.env

# Sentry Config File
.env.sentry-build-plugin
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 74
versionName "1.7.13"
versionCode 76
versionName "1.8.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
Expand Down
8 changes: 7 additions & 1 deletion e2e/encrypt.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ test("test local encrypt", async ({ page }) => {
// Click the "Decrypt Wallet" button
await page.click("text=Decrypt Wallet");

// Wait for an element matching the selector to appear in DOM.
// Should have a balance up top now
await page.locator(`text=0 sats`).first().waitFor();

const shutdownPopup = page.getByText("Mutiny Wallet is Shutting Down");
if (await shutdownPopup.isVisible()) {
// Click the close button
await page.getByRole("button").nth(1).click();
}
});
6 changes: 6 additions & 0 deletions e2e/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ export async function loadHome(page: Page) {

// Should have a balance up top now
await page.locator(`text=0 sats`).first().waitFor();

const shutdownPopup = page.getByText("Mutiny Wallet is Shutting Down");
if (await shutdownPopup.isVisible()) {
// Click the close button
await page.getByRole("button").nth(1).click();
}
}

export async function visitSettings(page: Page) {
Expand Down
4 changes: 2 additions & 2 deletions ios/App/App.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.7.13;
MARKETING_VERSION = 1.8.0;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = "com.mutinywallet.mutiny-test";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -387,7 +387,7 @@
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.7.13;
MARKETING_VERSION = 1.8.0;
PRODUCT_BUNDLE_IDENTIFIER = com.mutinywallet.mutiny;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
6 changes: 2 additions & 4 deletions 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": "1.7.13",
"version": "1.8.0",
"license": "MIT",
"packageManager": "[email protected]",
"scripts": {
Expand Down Expand Up @@ -56,9 +56,7 @@
"@kobalte/core": "^0.12.6",
"@kobalte/tailwindcss": "^0.9.0",
"@modular-forms/solid": "^0.20.0",
"@mutinywallet/mutiny-wasm": "1.7.12",
"@sentry/browser": "^8.7.0",
"@sentry/vite-plugin": "^2.18.0",
"@mutinywallet/mutiny-wasm": "1.7.13",
"@solid-primitives/upload": "^0.0.117",
"@solidjs/meta": "^0.29.3",
"@solidjs/router": "^0.13.1",
Expand Down
Loading
Loading