Merge branch 'develop' of https://github.com/iotaledger/firefly into develop

Author: cvarley100

.github/workflows/build-desktop.yml

@@ -179,7 +179,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         tag_name: ${{ github.ref }}
-        release_name: Firefly Desktop Alpha ${{ env.RELEASE_VERSION }}
+        release_name: Firefly Desktop ${{ env.RELEASE_VERSION }}
         body_path: packages/desktop/CHANGELOG.md
         draft: true
         prerelease: true

packages/backend/bindings/node/native/Cargo.lock

@@ -6,8 +6,7 @@ const Keychain = {
     /**
      * Service name — Key under which credentials will be stored.
      */
-    // TODO: Remove `Firefly Migration`
-    SERVICE_NAME: app.isPackaged ? 'Firefly Migration' : 'Firefly — Dev',
+    SERVICE_NAME: app.isPackaged ? 'Firefly' : 'Firefly — Dev',
     /**
      * Gets all credentials from keychain
      *

packages/desktop/electron/lib/keychain.js

@@ -85,22 +85,30 @@ const buildTemplate = () => {
                     label: state.strings.diagnostics,
                     click: () => getOrInitWindow('main').webContents.send('menu-diagnostics'),
                 },
-                {
-                    // TODO: Remove before stable release
-                    label: "Developer Tools",
-                    role: 'toggleDevTools'
-                },
-                {
-                    label: state.strings.errorLog,
-                    click: () => getOrInitWindow('main').webContents.send('menu-error-log')
-                },
-                {
-                    type: 'separator',
-                },
             ]
         }
     ]
 
+    if (!app.isPackaged) {
+        template[0].submenu.push(
+            {
+                label: "Developer Tools",
+                role: 'toggleDevTools'
+            }
+        )
+    }
+
+    template[0].submenu = template[0].submenu.concat([
+        {
+            label: state.strings.errorLog,
+            click: () => getOrInitWindow('main').webContents.send('menu-error-log')
+        },
+        {
+            type: 'separator',
+        },
+    ]
+    )
+
     if (process.platform === 'darwin') {
         template[0].submenu = template[0].submenu.concat([
             {

packages/desktop/electron/lib/menu.js

@@ -38,11 +38,6 @@ const windows = {
     about: null,
 }
 
-/**
- * Set environment mode
- */
-const devMode = process.env.NODE_ENV === 'development'
-
 let paths = {
     preload: '',
     html: '',
@@ -61,8 +56,7 @@ const defaultWebPreferences = {
     disableBlinkFeatures: 'Auxclick',
     webviewTag: false,
     enableWebSQL: false,
-    // TODO: Remove before stable
-    devTools: true,
+    devTools: !app.isPackaged,
 }
 
 if (app.isPackaged) {
@@ -155,12 +149,10 @@ function createWindow() {
 
     mainWindowState.track(windows.main);
 
-    if (devMode) {
+    if (!app.isPackaged) {
         // Enable dev tools only in developer mode
         windows.main.webContents.openDevTools()
-    }
 
-    if (devMode) {
         windows.main.loadURL('http://localhost:8080')
     } else {
         initAutoUpdate(windows.main)

packages/desktop/electron/main.js

@@ -1,7 +1,7 @@
 {
     "name": "desktop",
-    "productName": "Firefly Migration",
-    "version": "0.4.0",
+    "productName": "Firefly",
+    "version": "1.0.0",
     "description": "IOTA wallet desktop",
     "main": "public/build/main.js",
     "repository": "[email protected]:iotaledger/new-wallet.git",
@@ -47,7 +47,7 @@
         "webpack-dev-server": "^3.11.2"
     },
     "build": {
-        "productName": "Firefly Migration",
+        "productName": "Firefly",
         "artifactName": "firefly-desktop-${version}.${ext}",
         "copyright": "IOTA Foundation",
         "directories": {

packages/desktop/package.json

@@ -7,11 +7,10 @@
             http-equiv="Content-Security-Policy"
             content="
             default-src 'self';
-            connect-src 'self' https://*.iota.org https://*.iota.works https://*.iotatestmigration4.net https://*.iotatestmigration.net https://*.chrysalis2.com https://raw.githubusercontent.com/iotaledger/firefly/develop/packages/shared/lib/chrysalis.json;
+            connect-src 'self' https://*.iota.org https://*.iota.works https://*.iota.cafe https://raw.githubusercontent.com/iotaledger/firefly/develop/packages/shared/lib/chrysalis.json;
             object-src 'none';
             style-src 'self' 'unsafe-inline';"
         />
-        <!-- TODO: Remove iotatestmigration and chrysalis2-->
         <title>Firefly</title>
 
         <link rel="icon" type="image/png" href="/favicon.png" />

packages/desktop/public/index.html

@@ -19,7 +19,7 @@ exports.default = async () => {
 
     await notarize({
         appBundleId: 'org.iota.firefly',
-        appPath: path.resolve(__dirname, '../out/mac/Firefly Migration.app'),
+        appPath: path.resolve(__dirname, '../out/mac/Firefly.app'),
         appleId: APPLE_ID,
         appleIdPassword: APPLE_ID_PASSWORD,
         ascProvider: 'UG77RJKZHH',