fix(baklava): fix benawad#2605 and don't show "Download App" on the app

idsus · May 6, 2021 · 4768dc5 · 4768dc5
1 parent 3f1c6b6
commit 4768dc5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/baklava/package.json b/baklava/package.json
@@ -1,6 +1,6 @@
 {
     "name": "dogehouse",
-    "version": "1.0.63",
+    "version": "1.0.64",
     "description": "Taking voice conversations to the moon 🚀",
     "main": "./dist/electron.js",
     "scripts": {

diff --git a/baklava/src/utils/keybinds/index.ts b/baklava/src/utils/keybinds/index.ts
@@ -27,7 +27,7 @@ export let CURRENT_INVITE_KEY = "Control+7";
 export let CURRENT_MUTE_KEY = "Control+m";
 export let CURRENT_DEAF_KEY = "Control+1";
 export let CURRENT_CHAT_KEY = "Control+9";
-export let CURRENT_OVERLAY_KEY = "Control+Tab";
+export let CURRENT_OVERLAY_KEY = "Control+2";
 export let CURRENT_PTT_KEY = ["0", "Control"];
 export let CURRENT_PTT_KEY_STRING = "0,control"
 

diff --git a/kibbeh/src/global-stores/useKeyMapStore.ts b/kibbeh/src/global-stores/useKeyMapStore.ts
@@ -52,7 +52,7 @@ function getPTTKeybind() {
 }
 
 function getOverlayKeybind() {
-  return getKeybind(OVERLAY_KEY, "Control+Tab");
+  return getKeybind(OVERLAY_KEY, "Control+2");
 }
 
 const keyMap: KeyMap = {

diff --git a/kibbeh/src/modules/landing-page/LoginPage.tsx b/kibbeh/src/modules/landing-page/LoginPage.tsx
@@ -147,9 +147,7 @@ export const LoginPage: React.FC = () => {
                 <SvgSolidDiscord width={20} height={20} />
                 Log in with Discord
               </LoginButton>
-            ) : (
-              <></>
-            )}
+            ) : null}
             {!__prod__ ? (
               <LoginButton
                 dev

diff --git a/kibbeh/src/ui/SettingsDropdown.tsx b/kibbeh/src/ui/SettingsDropdown.tsx
@@ -1,4 +1,5 @@
 import { User } from "@dogehouse/kebab";
+import isElectron from "is-electron";
 import { useRouter } from "next/router";
 import React, { ReactNode, useState } from "react";
 import { useDebugAudioStore } from "../global-stores/useDebugAudio";
@@ -90,12 +91,14 @@ export const SettingsDropdown: React.FC<{
             onClick={() => setDebugAudio(!debugAudio)}
           />
 
-          <SettingsIcon
-            onClick={() => push("/download")}
-            icon={<SvgSolidDownload />}
-            label={t("components.settingsDropdown.downloadApp")}
-            transition
-          />
+          {!isElectron() ? (
+            <SettingsIcon
+              onClick={() => push("/download")}
+              icon={<SvgSolidDownload />}
+              label={t("components.settingsDropdown.downloadApp")}
+              transition
+            />
+          ) : null}
 
           <a
             href="https://discord.gg/wCbKBZF9cV"