Merge branch 'app-tray' of https://github.com/shapeshift/keepkey-client

� Conflicts: � src-electron/main-process/electron-main.js
shapeshift · Oct 26, 2021 · f62790b · f62790b
2 parents d96d2e6 + fa7408d
commit f62790b
Show file tree

Hide file tree

Showing 54 changed files with 270 additions and 25,114 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "window.title": "${activeEditorShort}${separator}${rootName} ${separator} [Branch: app-tray]"
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/src-electron/main-process/assets/cloudTemplate.png b/src-electron/main-process/assets/cloudTemplate.png
diff --git a/src-electron/main-process/assets/[email protected] b/src-electron/main-process/assets/[email protected]
diff --git a/src-electron/main-process/assets/connected.png b/src-electron/main-process/assets/connected.png
diff --git a/src-electron/main-process/assets/[email protected] b/src-electron/main-process/assets/[email protected]
diff --git a/src-electron/main-process/assets/dark/keepKey/error.png b/src-electron/main-process/assets/dark/keepKey/error.png
diff --git a/src-electron/main-process/assets/dark/keepKey/[email protected] b/src-electron/main-process/assets/dark/keepKey/[email protected]
diff --git a/src-electron/main-process/assets/dark/keepKey/fetching.png b/src-electron/main-process/assets/dark/keepKey/fetching.png
diff --git a/src-electron/main-process/assets/dark/keepKey/[email protected] b/src-electron/main-process/assets/dark/keepKey/[email protected]
diff --git a/src-electron/main-process/assets/dark/keepKey/info.png b/src-electron/main-process/assets/dark/keepKey/info.png
diff --git a/src-electron/main-process/assets/dark/keepKey/[email protected] b/src-electron/main-process/assets/dark/keepKey/[email protected]
diff --git a/src-electron/main-process/assets/dark/keepKey/success.png b/src-electron/main-process/assets/dark/keepKey/success.png
diff --git a/src-electron/main-process/assets/dark/keepKey/[email protected] b/src-electron/main-process/assets/dark/keepKey/[email protected]
diff --git a/src-electron/main-process/assets/dark/keepKey/unknown.png b/src-electron/main-process/assets/dark/keepKey/unknown.png
diff --git a/src-electron/main-process/assets/dark/keepKey/[email protected] b/src-electron/main-process/assets/dark/keepKey/[email protected]
diff --git a/src-electron/main-process/assets/dark/keepKey/warning.png b/src-electron/main-process/assets/dark/keepKey/warning.png
diff --git a/src-electron/main-process/assets/dark/keepKey/[email protected] b/src-electron/main-process/assets/dark/keepKey/[email protected]
diff --git a/src-electron/main-process/assets/flagTemplate.png b/src-electron/main-process/assets/flagTemplate.png
diff --git a/src-electron/main-process/assets/[email protected] b/src-electron/main-process/assets/[email protected]
diff --git a/src-electron/main-process/assets/keepKeyConnected.png b/src-electron/main-process/assets/keepKeyConnected.png
diff --git a/src-electron/main-process/assets/keepKeyConnectedTemplate 2.png b/src-electron/main-process/assets/keepKeyConnectedTemplate 2.png
diff --git a/src-electron/main-process/assets/keepKeyConnectedTemplate.png b/src-electron/main-process/assets/keepKeyConnectedTemplate.png
diff --git a/src-electron/main-process/assets/keepkey-connected.png b/src-electron/main-process/assets/keepkey-connected.png
diff --git a/src-electron/main-process/assets/[email protected] b/src-electron/main-process/assets/[email protected]
diff --git a/src-electron/main-process/assets/light/keepKey/error.png b/src-electron/main-process/assets/light/keepKey/error.png
diff --git a/src-electron/main-process/assets/light/keepKey/[email protected] b/src-electron/main-process/assets/light/keepKey/[email protected]
diff --git a/src-electron/main-process/assets/light/keepKey/fetching.png b/src-electron/main-process/assets/light/keepKey/fetching.png
diff --git a/src-electron/main-process/assets/light/keepKey/[email protected] b/src-electron/main-process/assets/light/keepKey/[email protected]
diff --git a/src-electron/main-process/assets/light/keepKey/info.png b/src-electron/main-process/assets/light/keepKey/info.png
diff --git a/src-electron/main-process/assets/light/keepKey/[email protected] b/src-electron/main-process/assets/light/keepKey/[email protected]
diff --git a/src-electron/main-process/assets/light/keepKey/success.png b/src-electron/main-process/assets/light/keepKey/success.png
diff --git a/src-electron/main-process/assets/light/keepKey/[email protected] b/src-electron/main-process/assets/light/keepKey/[email protected]
diff --git a/src-electron/main-process/assets/light/keepKey/unknown.png b/src-electron/main-process/assets/light/keepKey/unknown.png
diff --git a/src-electron/main-process/assets/light/keepKey/[email protected] b/src-electron/main-process/assets/light/keepKey/[email protected]
diff --git a/src-electron/main-process/assets/light/keepKey/warning.png b/src-electron/main-process/assets/light/keepKey/warning.png
diff --git a/src-electron/main-process/assets/light/keepKey/[email protected] b/src-electron/main-process/assets/light/keepKey/[email protected]
diff --git a/src-electron/main-process/assets/moonTemplate.png b/src-electron/main-process/assets/moonTemplate.png
diff --git a/src-electron/main-process/assets/[email protected] b/src-electron/main-process/assets/[email protected]
diff --git a/src-electron/main-process/assets/status/error.png b/src-electron/main-process/assets/status/error.png
diff --git a/src-electron/main-process/assets/status/[email protected] b/src-electron/main-process/assets/status/[email protected]
diff --git a/src-electron/main-process/assets/status/info.png b/src-electron/main-process/assets/status/info.png
diff --git a/src-electron/main-process/assets/status/[email protected] b/src-electron/main-process/assets/status/[email protected]
diff --git a/src-electron/main-process/assets/status/success.png b/src-electron/main-process/assets/status/success.png
diff --git a/src-electron/main-process/assets/status/[email protected] b/src-electron/main-process/assets/status/[email protected]
diff --git a/src-electron/main-process/assets/status/unknown.png b/src-electron/main-process/assets/status/unknown.png
diff --git a/src-electron/main-process/assets/status/[email protected] b/src-electron/main-process/assets/status/[email protected]
diff --git a/src-electron/main-process/assets/status/warning.png b/src-electron/main-process/assets/status/warning.png
diff --git a/src-electron/main-process/assets/status/[email protected] b/src-electron/main-process/assets/status/[email protected]
diff --git a/src-electron/main-process/assets/sunTemplate.png b/src-electron/main-process/assets/sunTemplate.png
diff --git a/src-electron/main-process/assets/[email protected] b/src-electron/main-process/assets/[email protected]
diff --git a/src-electron/main-process/assets/umbrellaTemplate.png b/src-electron/main-process/assets/umbrellaTemplate.png
diff --git a/src-electron/main-process/assets/[email protected] b/src-electron/main-process/assets/[email protected]