0.6.1 release

.eslintrc.cjs

@@ -20,13 +20,7 @@ module.exports = {
             rules: {
                 "@typescript-eslint/no-var-requires": "off" // Disable this specific rule for CJS files
             }
-        },
-        {
-            files: ['src/i18n/**/translations.ts'],
-            rules: {
-                "internal-rules/check-i18n-keys": "off" //Disabled so no warnings are presented everytime pre-commit is run
-            }
-        },      
+        }
     ],
     parser: "@typescript-eslint/parser",
     parserOptions: {
@@ -38,7 +32,7 @@ module.exports = {
             jsx: true
         }
     },
-    plugins: ["@typescript-eslint", "solid", "import", "internal-rules"],
+    plugins: ["@typescript-eslint", "solid", "import"],
     rules: {
         "@typescript-eslint/no-unused-vars": [
             "warn",

.gitignore

@@ -11,6 +11,7 @@ node_modules
 dist
 dist-ssr
 *.local
+android/app/play/*
 
 # Editor directories and files
 .vscode/*
@@ -32,4 +33,4 @@ dev-dist
 /playwright-report/
 /playwright/.cache/
 
-.env
+.env

README.md

@@ -131,41 +131,28 @@ just i18n $lang
 
 ### Adding new languages or keys
 
-1. In `src/i18n/` locate your desired language folder or create one if one does not exist
+1. In `public/i18n/` locate your desired language .json file or create one if one does not exist
 
-    - When creating a new language dir ensure it follows the ISO 639 2-letter standard
+    - When creating a new language file ensure it follows the ISO 639 2-letter standard
 
-2. In this folder create a file called `translations.ts`, this is where the translation keys for your desired language will be located
+2. Populate your translation file with a translation object where all of the keys will be located
 
-3. Populate your translation file with a translation object where all of the keys will be located
-
-If you want to add Japanese you will create a file `/src/i18n/jp/translations.ts` and populate it with keys like so:
+If you want to add Japanese you will create a file `/public/i18n/jp.json` and populate it with keys like so:
 
 ```
-export default {
-    common: {
-        continue: "続ける",
+{
+  "common": {
+        "continue": "続ける",
         ...
     }
 }
 ```
 
 (You should compare your translations against the English language as all other languages are not the master and are likely deprecated)
 
-4. Add your new translation file to the `/src/i18n/config.ts` so you can begin to see them in the app
-
-```
-import fa from "~/i18n/jp/translations.ts"
-
-export const resources: {
-    ...
-    jp: {
-        translations: jp
-    }
-}
-```
+If you're using VS Code there are some nice extensions that can make this easier like i18n-ally and i18n-json-editor
 
-5. Add your language to the `Language` object in `/src/utils/languages.ts`. This will allow you to select the language via the language selector in the UI. If your desired language is set as your primary language in your browser it will be selected automatically
+3. Add your language to the `Language` object in `/src/utils/languages.ts`. This will allow you to select the language via the language selector in the UI. If your desired language is set as your primary language in your browser it will be selected automatically
 
 ```
 export const LANGUAGE_OPTIONS: Language[] = [
@@ -175,4 +162,4 @@ export const LANGUAGE_OPTIONS: Language[] = [
     },
 ```
 
-6. That's it! You should now be able to see your translation keys populating the app in your desired language. When youre ready go ahead and open a PR to have you language merged for others!
+4. That's it! You should now be able to see your translation keys populating the app in your desired language. When youre ready go ahead and open a PR to have you language merged for others!

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.mutinywallet.mutinywallet"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 51
-        versionName "0.5.10"
+        versionCode 53
+        versionName "0.6.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

android/app/capacitor.build.gradle

@@ -18,6 +18,7 @@ dependencies {
     implementation project(':capacitor-share')
     implementation project(':capacitor-status-bar')
     implementation project(':capacitor-toast')
+    implementation project(':capacitor-secure-storage-plugin')
 
 }
 

android/capacitor.settings.gradle

@@ -1,30 +1,33 @@
 // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 include ':capacitor-android'
-project(':capacitor-android').projectDir = new File('../node_modules/.pnpm/@capacitor+android@5.5.1_@capacitor+core@5.5.1/node_modules/@capacitor/android/capacitor')
+project(':capacitor-android').projectDir = new File('../node_modules/.pnpm/@capacitor+android@5.7.4_@capacitor+core@5.7.4/node_modules/@capacitor/android/capacitor')
 
 include ':capacitor-mlkit-barcode-scanning'
-project(':capacitor-mlkit-barcode-scanning').projectDir = new File('../node_modules/.pnpm/@capacitor-mlkit+barcode-scanning@5.3.0_@capacitor+core@5.5.1/node_modules/@capacitor-mlkit/barcode-scanning/android')
+project(':capacitor-mlkit-barcode-scanning').projectDir = new File('../node_modules/.pnpm/@capacitor-mlkit+barcode-scanning@5.4.0_@capacitor+core@5.7.4/node_modules/@capacitor-mlkit/barcode-scanning/android')
 
 include ':capacitor-app'
-project(':capacitor-app').projectDir = new File('../node_modules/.pnpm/@[email protected].6_@capacitor+core@5.5.1/node_modules/@capacitor/app/android')
+project(':capacitor-app').projectDir = new File('../node_modules/.pnpm/@[email protected].7_@capacitor+core@5.7.4/node_modules/@capacitor/app/android')
 
 include ':capacitor-app-launcher'
-project(':capacitor-app-launcher').projectDir = new File('../node_modules/.pnpm/@[email protected].6_@capacitor+core@5.5.1/node_modules/@capacitor/app-launcher/android')
+project(':capacitor-app-launcher').projectDir = new File('../node_modules/.pnpm/@[email protected].7_@capacitor+core@5.7.4/node_modules/@capacitor/app-launcher/android')
 
 include ':capacitor-clipboard'
-project(':capacitor-clipboard').projectDir = new File('../node_modules/.pnpm/@[email protected].6_@capacitor+core@5.5.1/node_modules/@capacitor/clipboard/android')
+project(':capacitor-clipboard').projectDir = new File('../node_modules/.pnpm/@[email protected].7_@capacitor+core@5.7.4/node_modules/@capacitor/clipboard/android')
 
 include ':capacitor-filesystem'
-project(':capacitor-filesystem').projectDir = new File('../node_modules/.pnpm/@capacitor+filesystem@5.1.4_@capacitor+core@5.5.1/node_modules/@capacitor/filesystem/android')
+project(':capacitor-filesystem').projectDir = new File('../node_modules/.pnpm/@capacitor+filesystem@5.2.1_@capacitor+core@5.7.4/node_modules/@capacitor/filesystem/android')
 
 include ':capacitor-haptics'
-project(':capacitor-haptics').projectDir = new File('../node_modules/.pnpm/@[email protected].6_@capacitor+core@5.5.1/node_modules/@capacitor/haptics/android')
+project(':capacitor-haptics').projectDir = new File('../node_modules/.pnpm/@[email protected].7_@capacitor+core@5.7.4/node_modules/@capacitor/haptics/android')
 
 include ':capacitor-share'
-project(':capacitor-share').projectDir = new File('../node_modules/.pnpm/@[email protected].6_@capacitor+core@5.5.1/node_modules/@capacitor/share/android')
+project(':capacitor-share').projectDir = new File('../node_modules/.pnpm/@[email protected].7_@capacitor+core@5.7.4/node_modules/@capacitor/share/android')
 
 include ':capacitor-status-bar'
-project(':capacitor-status-bar').projectDir = new File('../node_modules/.pnpm/@[email protected].6_@capacitor+core@5.5.1/node_modules/@capacitor/status-bar/android')
+project(':capacitor-status-bar').projectDir = new File('../node_modules/.pnpm/@[email protected].7_@capacitor+core@5.7.4/node_modules/@capacitor/status-bar/android')
 
 include ':capacitor-toast'
-project(':capacitor-toast').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/toast/android')
+project(':capacitor-toast').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/toast/android')
+
+include ':capacitor-secure-storage-plugin'
+project(':capacitor-secure-storage-plugin').projectDir = new File('../node_modules/.pnpm/[email protected]_@[email protected]/node_modules/capacitor-secure-storage-plugin/android')

e2e/encrypt.spec.ts

@@ -1,28 +1,14 @@
 import { expect, test } from "@playwright/test";
 
+import { loadHome, visitSettings } from "./utils";
+
 test.beforeEach(async ({ page }) => {
     await page.goto("http://localhost:3420/");
 });
 
 test("test local encrypt", async ({ page }) => {
-    // Expect a title "to contain" a substring.
-    await expect(page).toHaveTitle(/Mutiny Wallet/);
-
-    // Wait for an element matching the selector to appear in DOM.
-    await page.waitForSelector("text=0 SATS");
-
-    console.log("Page loaded.");
-
-    // Wait for a while just to make sure we can load everything
-    await page.waitForTimeout(1000);
-
-    // Navigate to settings
-    const settingsLink = await page.getByRole("link", { name: "Settings" });
-
-    settingsLink.click();
-
-    // Wait for settings to load
-    await page.waitForSelector("text=Settings");
+    await loadHome(page);
+    await visitSettings(page);
 
     // Click the "Backup" link
     await page.click("text=Backup");
@@ -48,6 +34,13 @@ test("test local encrypt", async ({ page }) => {
     // Click the "I wrote down the words" button
     await wroteDownButton.click();
 
+    // Make sure the balance box ready light is on
+    await page.locator("title=READY");
+
+    // Go back to settings / change password
+    await visitSettings(page);
+    await page.click("text=Security");
+
     // The header should now say "Encrypt your seed words"
     await expect(page.locator("h1")).toContainText(["Encrypt your seed words"]);
 
@@ -56,35 +49,41 @@ test("test local encrypt", async ({ page }) => {
     const passwordInput = await page.locator(`input[name='password']`);
 
     // 2. Type the password into the input field
-    await passwordInput.type("test");
+    await passwordInput.fill("test");
 
     // 3. Find the input field with the name "confirmPassword"
     const confirmPasswordInput = await page.locator(
         `input[name='confirmPassword']`
     );
 
     // 4. Type the password into the input field
-    await confirmPasswordInput.type("test");
+    await confirmPasswordInput.fill("test");
 
     // The "Encrypt" button should not be disabled
     const encryptButton = await page.locator("button", { hasText: "Encrypt" });
     await expect(encryptButton).not.toBeDisabled();
 
+    // wait 5 seconds for no reason (SADLY THIS IS IMPORTANT FOR THE TEST TO PASS)
+    await page.waitForTimeout(5000);
+
     // Click the "Encrypt" button
     await encryptButton.click();
 
+    // wait for a while just to see what happens
+    // await page.waitForTimeout(10000);
+
     // Wait for a modal with the text "Enter your password"
     await page.waitForSelector("text=Enter your password");
 
     // Find the input field with the name "password"
     const passwordInput2 = await page.locator(`input[name='password']`);
 
     // Type the password into the input field
-    await passwordInput2.type("test");
+    await passwordInput2.fill("test");
 
     // Click the "Decrypt Wallet" button
     await page.click("text=Decrypt Wallet");
 
     // Wait for an element matching the selector to appear in DOM.
-    await page.waitForSelector("text=0 SATS");
+    await page.locator(`text=0 sats`).first();
 });