From 61455faae24874498f520e65a1357ea74ed8ae39 Mon Sep 17 00:00:00 2001
From: Martyn Janes <martyn@obany.com>
Date: Tue, 16 Mar 2021 12:45:10 +0100
Subject: [PATCH 1/2] fix: Windows overspill

---
 .../shared/routes/dashboard/wallet/views/Account.svelte   | 2 +-
 .../shared/routes/dashboard/wallet/views/Receive.svelte   | 8 ++++----
 .../routes/setup/backup/views/RecoveryPhrase.svelte       | 2 +-
 .../routes/setup/backup/views/VerifyRecoveryPhrase.svelte | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/shared/routes/dashboard/wallet/views/Account.svelte b/packages/shared/routes/dashboard/wallet/views/Account.svelte
index 9844044c6a5..b7ac88ac8fa 100644
--- a/packages/shared/routes/dashboard/wallet/views/Account.svelte
+++ b/packages/shared/routes/dashboard/wallet/views/Account.svelte
@@ -27,7 +27,7 @@
 
 <!-- wait for account to load -->
 {#if $accounts && $account}
-    <div class="w-full h-full flex flex-col flex-nowrap px-10 pb-10 relative flex-1 bg-gray-50 dark:bg-gray-900">
+    <div class="w-full h-full flex flex-col flex-nowrap px-10 pb-5 relative flex-1 bg-gray-50 dark:bg-gray-900">
         <AccountNavigation {locale} accounts={navAccounts} />
         {#key $account}
             <div class="w-full h-full grid grid-cols-3 gap-x-4 min-h-0">
diff --git a/packages/shared/routes/dashboard/wallet/views/Receive.svelte b/packages/shared/routes/dashboard/wallet/views/Receive.svelte
index 2f49de2980a..bf000cee281 100644
--- a/packages/shared/routes/dashboard/wallet/views/Receive.svelte
+++ b/packages/shared/routes/dashboard/wallet/views/Receive.svelte
@@ -48,20 +48,20 @@
         {/if}
         <div
             class="w-full h-full flex flex-col flex-auto rounded-2xl border border-solid border-gray-300 dark:border-gray-700 p-4">
-            <div class="w-full flex flex-row justify-between items-start">
-                <Text type="p" smaler bold classes="mb-4">{locale('actions.receive')}</Text>
+            <div class="w-full flex flex-row justify-between items-start mb-1">
+                <Text type="p" smaler bold>{locale('actions.receive')}</Text>
                 <button on:click={generateNewAddress} class:pointer-events-none={isGeneratingAddress}>
                     <Icon icon="refresh" classes="{isGeneratingAddress && 'animate-spin'} text-gray-500 dark:text-white" />
                 </button>
             </div>
-            <div class="flex flex-auto items-center justify-center mb-6">
+            <div class="flex flex-auto items-center justify-center mb-4">
                 <QR size={98} data={selectedAccount.depositAddress} />
             </div>
             <div class="mb-6">
                 <Text secondary smaller classes="mb-1">{locale('general.myAddress')}</Text>
                 <Text type="pre">{selectedAccount.depositAddress}</Text>
             </div>
-            <Button disabled={isGeneratingAddress} classes="w-full" onClick={() => setClipboard(selectedAccount.depositAddress)}>
+            <Button small disabled={isGeneratingAddress} classes="w-full" onClick={() => setClipboard(selectedAccount.depositAddress)}>
                 {locale('general.copyAddress')}
             </Button>
         </div>
diff --git a/packages/shared/routes/setup/backup/views/RecoveryPhrase.svelte b/packages/shared/routes/setup/backup/views/RecoveryPhrase.svelte
index 8630fe259ea..cefc50d1854 100644
--- a/packages/shared/routes/setup/backup/views/RecoveryPhrase.svelte
+++ b/packages/shared/routes/setup/backup/views/RecoveryPhrase.svelte
@@ -41,7 +41,7 @@
                 {locale('actions.continue')}
             </Button>
         </div>
-        <div slot="rightpane" class="w-full h-full flex flex-col flex-wrap items-center justify-center p-16">
+        <div slot="rightpane" class="w-full h-full flex flex-col items-center justify-center p-4">
             {#if mnemonic !== undefined && mnemonic !== null}
                 <RecoveryPhrase classes="mb-8" recoveryPhrase={mnemonic} {hide} />
                 <Button onClick={handleMnemonicVisibilityClick}>
diff --git a/packages/shared/routes/setup/backup/views/VerifyRecoveryPhrase.svelte b/packages/shared/routes/setup/backup/views/VerifyRecoveryPhrase.svelte
index 054cdcc7d0f..fd2408c4d57 100644
--- a/packages/shared/routes/setup/backup/views/VerifyRecoveryPhrase.svelte
+++ b/packages/shared/routes/setup/backup/views/VerifyRecoveryPhrase.svelte
@@ -46,7 +46,7 @@
                 {:else}{locale('actions.verifyRecoveryPhrase')}{/if}
             </Button>
         </div>
-        <div slot="rightpane" class="w-full h-full flex flex-col flex-wrap items-center justify-center p-16">
+        <div slot="rightpane" class="w-full h-full flex flex-col items-center justify-center p-4">
             <RecoveryPhrase
                 classes="mb-8"
                 recoveryPhrase={mnemonic}

From 6a8539504b1f160df59b9e379f3d1b55d69ea614 Mon Sep 17 00:00:00 2001
From: Martyn Janes <martyn@obany.com>
Date: Tue, 16 Mar 2021 13:05:33 +0100
Subject: [PATCH 2/2] fix: Further overspill fixes

---
 packages/shared/components/AccountTile.svelte                 | 4 ++--
 packages/shared/components/SecurityTile.svelte                | 2 +-
 packages/shared/routes/dashboard/wallet/views/Receive.svelte  | 4 ++--
 packages/shared/routes/dashboard/wallet/views/Security.svelte | 4 ++--
 .../shared/routes/dashboard/wallet/views/WalletBalance.svelte | 4 ++--
 .../shared/routes/dashboard/wallet/views/WalletHistory.svelte | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/shared/components/AccountTile.svelte b/packages/shared/components/AccountTile.svelte
index 6da509c0205..9748c7b6267 100644
--- a/packages/shared/components/AccountTile.svelte
+++ b/packages/shared/components/AccountTile.svelte
@@ -12,7 +12,7 @@
 <style type="text/scss">
     button {
         height: auto;
-        min-height: 92px;
+        min-height: 110px;
         &.size-m,
         &.size-l {
             height: 70%;
@@ -29,7 +29,7 @@
         <Text
             smaller={size === 's'}
             overrideColor
-            classes="block text-gray-800 dark:text-white group-hover:text-white group-hover:font-700">
+            classes="block text-gray-800 dark:text-white group-hover:text-white group-hover:font-700 mr-4">
             {balance}
         </Text>
         <Text smaller={size === 's'} overrideColor classes="block text-blue-500 dark:text-gray-600 group-hover:text-white">
diff --git a/packages/shared/components/SecurityTile.svelte b/packages/shared/components/SecurityTile.svelte
index 4fa52ad3d32..0737d7a8097 100644
--- a/packages/shared/components/SecurityTile.svelte
+++ b/packages/shared/components/SecurityTile.svelte
@@ -11,7 +11,7 @@
 
 <button
     on:click={() => onClick()}
-    class="flex flex-col flex-wrap justify-between text-left rounded-xl px-3 py-3 bg-{color}-50 dark:bg-gray-900 dark:bg-opacity-50 {classes}">
+    class="flex flex-col flex-wrap text-left rounded-xl px-3 py-3 bg-{color}-50 dark:bg-gray-900 dark:bg-opacity-50 {classes}">
     <Icon boxed {icon} classes="text-white" boxClasses="mb-2 bg-{color}-600" />
     <div>
         <Text>{title}</Text>
diff --git a/packages/shared/routes/dashboard/wallet/views/Receive.svelte b/packages/shared/routes/dashboard/wallet/views/Receive.svelte
index bf000cee281..639e1a342bb 100644
--- a/packages/shared/routes/dashboard/wallet/views/Receive.svelte
+++ b/packages/shared/routes/dashboard/wallet/views/Receive.svelte
@@ -48,8 +48,8 @@
         {/if}
         <div
             class="w-full h-full flex flex-col flex-auto rounded-2xl border border-solid border-gray-300 dark:border-gray-700 p-4">
-            <div class="w-full flex flex-row justify-between items-start mb-1">
-                <Text type="p" smaler bold>{locale('actions.receive')}</Text>
+            <div class="w-full flex flex-row justify-between items-center mb-1">
+                <Text type="p" smaller bold>{locale('actions.receive')}</Text>
                 <button on:click={generateNewAddress} class:pointer-events-none={isGeneratingAddress}>
                     <Icon icon="refresh" classes="{isGeneratingAddress && 'animate-spin'} text-gray-500 dark:text-white" />
                 </button>
diff --git a/packages/shared/routes/dashboard/wallet/views/Security.svelte b/packages/shared/routes/dashboard/wallet/views/Security.svelte
index 92f570a7ad4..476102a97d4 100644
--- a/packages/shared/routes/dashboard/wallet/views/Security.svelte
+++ b/packages/shared/routes/dashboard/wallet/views/Security.svelte
@@ -58,8 +58,8 @@
     onDestroy(unsubscribe)
 </script>
 
-<div data-label="security" class="p-8 flex-grow flex flex-col">
-    <Text type="h4" classes="mb-5">{locale('general.security')}</Text>
+<div data-label="security" class="py-6 px-8 flex-grow flex flex-col">
+    <Text type="p" bold classes="mb-5">{locale('general.security')}</Text>
     <div class="grid grid-cols-2 gap-2">
         <!-- Firefly version -->
         <SecurityTile
diff --git a/packages/shared/routes/dashboard/wallet/views/WalletBalance.svelte b/packages/shared/routes/dashboard/wallet/views/WalletBalance.svelte
index 41807bbe95b..b47e25e31e4 100644
--- a/packages/shared/routes/dashboard/wallet/views/WalletBalance.svelte
+++ b/packages/shared/routes/dashboard/wallet/views/WalletBalance.svelte
@@ -12,7 +12,7 @@
     const balance = getContext<Readable<BalanceOverview>>('walletBalance')
 </script>
 
-<div class="bg-gradient-to-b from-{color}-500 to-{color}-600 dark:from-gray-800 dark:to-gray-900 rounded-t-2xl pt-10 pb-12 px-8">
+<div class="bg-gradient-to-b from-{color}-500 to-{color}-600 dark:from-gray-800 dark:to-gray-900 rounded-t-2xl pt-6 pb-10 px-8">
     <!-- Balance -->
     <div data-label="total-balance">
         <Text type="p" overrideColor smaller classes="text-white mb-2">{locale('general.totalBalance')}</Text>
@@ -21,7 +21,7 @@
     </div>
     {#if $walletRoute === WalletRoutes.Init}
         <!-- Incoming/Outgoing -->
-        <div data-label="total-movements" class="flex flex-row justify-between mt-10">
+        <div data-label="total-movements" class="flex flex-row justify-between mt-8">
             <div class="flex items-center">
                 <Icon boxed icon="chevron-down" classes="text-white" boxClasses="bg-{color}-300 dark:bg-gray-900 mr-4" />
                 <div>
diff --git a/packages/shared/routes/dashboard/wallet/views/WalletHistory.svelte b/packages/shared/routes/dashboard/wallet/views/WalletHistory.svelte
index 6177f8ef4af..667ad27e298 100644
--- a/packages/shared/routes/dashboard/wallet/views/WalletHistory.svelte
+++ b/packages/shared/routes/dashboard/wallet/views/WalletHistory.svelte
@@ -25,9 +25,9 @@
     }
 </script>
 
-<div data-label="latest-transactions" class="h-full p-8 flex-grow flex flex-col">
+<div data-label="latest-transactions" class="h-full py-6 px-8 flex-grow flex flex-col">
     <div class="w-full flex flex-row justify-between items-start">
-        <Text type="p" smaler bold classes="mb-5">{locale('general.latestTransactions')}</Text>
+        <Text type="p" bold classes="mb-5">{locale('general.latestTransactions')}</Text>
         <button on:click={syncAccounts} class:pointer-events-none={$isSyncing}>
             <Icon icon="refresh" classes="{$isSyncing && 'animate-spin'} text-gray-500 dark:text-white" />
         </button>