From 95bcf6ab88b4e1fc08d69d6d2a747b5d8ac99a58 Mon Sep 17 00:00:00 2001
From: Thibaut Boustany <thibaut@kastor.fr>
Date: Fri, 15 Jun 2018 18:28:05 +0200
Subject: [PATCH] Update banner also shows up on dashboard empty state

---
 src/components/DashboardPage/index.js         | 160 +++++++++---------
 .../UpdateNotifier/UpdateDownloaded.js        |   1 +
 2 files changed, 82 insertions(+), 79 deletions(-)

diff --git a/src/components/DashboardPage/index.js b/src/components/DashboardPage/index.js
index 5c3b7ee0..6894b765 100644
--- a/src/components/DashboardPage/index.js
+++ b/src/components/DashboardPage/index.js
@@ -95,93 +95,95 @@ class DashboardPage extends PureComponent<Props, State> {
     const displayOperations = accounts.some(displayOperationsHelper)
 
     return (
-      <Box flow={7}>
-        {totalAccounts > 0 ? (
-          <Fragment>
-            <UpdateNotifier mt={-5} />
-            <Box horizontal alignItems="flex-end">
-              <Box grow>
-                <Text color="dark" ff="Museo Sans" fontSize={7}>
-                  {t(timeFrame)}
-                </Text>
-                <Text color="grey" fontSize={5} ff="Museo Sans|Light">
-                  {t('app:dashboard.summary', { count: totalAccounts })}
-                </Text>
-              </Box>
-              <Box>
-                <PillsDaysCount
-                  selectedTime={selectedTime}
-                  onChange={this.handleChangeSelectedTime}
-                />
-              </Box>
-            </Box>
+      <Fragment>
+        <UpdateNotifier />
+        <Box flow={7}>
+          {totalAccounts > 0 ? (
             <Fragment>
-              <BalanceSummary
-                counterValue={counterValue}
-                chartId="dashboard-chart"
-                chartColor={colors.wallet}
-                accounts={accounts}
-                selectedTime={selectedTime}
-                daysCount={daysCount}
-                renderHeader={({ totalBalance, selectedTime, sinceBalance, refBalance }) => (
-                  <BalanceInfos
-                    t={t}
-                    counterValue={counterValue}
-                    totalBalance={totalBalance}
-                    since={selectedTime}
-                    sinceBalance={sinceBalance}
-                    refBalance={refBalance}
-                  />
-                )}
-              />
-              <Box flow={4}>
-                <Box horizontal alignItems="flex-end">
-                  <Text color="dark" ff="Museo Sans" fontSize={6}>
-                    {t('app:dashboard.accounts.title', { count: accounts.length })}
+              <Box horizontal alignItems="flex-end">
+                <Box grow>
+                  <Text color="dark" ff="Museo Sans" fontSize={7}>
+                    {t(timeFrame)}
+                  </Text>
+                  <Text color="grey" fontSize={5} ff="Museo Sans|Light">
+                    {t('app:dashboard.summary', { count: totalAccounts })}
                   </Text>
-                  <Box ml="auto" horizontal flow={1}>
-                    <AccountsOrder />
-                  </Box>
                 </Box>
-                <Box
-                  horizontal
-                  flexWrap="wrap"
-                  justifyContent="flex-start"
-                  alignItems="center"
-                  style={{ margin: '0 -16px' }}
-                >
-                  {accounts
-                    .concat(Array(3 - (accounts.length % 3)).fill(null))
-                    .map((account, i) => (
-                      <Box key={account ? account.id : `placeholder_${i}`} flex="33%" p={16}>
-                        {account ? (
-                          <AccountCard
-                            key={account.id}
-                            counterValue={counterValue}
-                            account={account}
-                            daysCount={daysCount}
-                            onClick={this.onAccountClick}
-                          />
-                        ) : null}
-                      </Box>
-                    ))}
+                <Box>
+                  <PillsDaysCount
+                    selectedTime={selectedTime}
+                    onChange={this.handleChangeSelectedTime}
+                  />
                 </Box>
               </Box>
-              {displayOperations && (
-                <OperationsList
-                  onAccountClick={this.onAccountClick}
+              <Fragment>
+                <BalanceSummary
+                  counterValue={counterValue}
+                  chartId="dashboard-chart"
+                  chartColor={colors.wallet}
                   accounts={accounts}
-                  title={t('app:dashboard.recentActivity')}
-                  withAccount
+                  selectedTime={selectedTime}
+                  daysCount={daysCount}
+                  renderHeader={({ totalBalance, selectedTime, sinceBalance, refBalance }) => (
+                    <BalanceInfos
+                      t={t}
+                      counterValue={counterValue}
+                      totalBalance={totalBalance}
+                      since={selectedTime}
+                      sinceBalance={sinceBalance}
+                      refBalance={refBalance}
+                    />
+                  )}
                 />
-              )}
-              <StickyBackToTop />
+                <Box flow={4}>
+                  <Box horizontal alignItems="flex-end">
+                    <Text color="dark" ff="Museo Sans" fontSize={6}>
+                      {t('app:dashboard.accounts.title', { count: accounts.length })}
+                    </Text>
+                    <Box ml="auto" horizontal flow={1}>
+                      <AccountsOrder />
+                    </Box>
+                  </Box>
+                  <Box
+                    horizontal
+                    flexWrap="wrap"
+                    justifyContent="flex-start"
+                    alignItems="center"
+                    style={{ margin: '0 -16px' }}
+                  >
+                    {accounts
+                      .concat(Array(3 - (accounts.length % 3)).fill(null))
+                      .map((account, i) => (
+                        <Box key={account ? account.id : `placeholder_${i}`} flex="33%" p={16}>
+                          {account ? (
+                            <AccountCard
+                              key={account.id}
+                              counterValue={counterValue}
+                              account={account}
+                              daysCount={daysCount}
+                              onClick={this.onAccountClick}
+                            />
+                          ) : null}
+                        </Box>
+                      ))}
+                  </Box>
+                </Box>
+                {displayOperations && (
+                  <OperationsList
+                    onAccountClick={this.onAccountClick}
+                    accounts={accounts}
+                    title={t('app:dashboard.recentActivity')}
+                    withAccount
+                  />
+                )}
+                <StickyBackToTop />
+              </Fragment>
             </Fragment>
-          </Fragment>
-        ) : (
-          <EmptyState />
-        )}
-      </Box>
+          ) : (
+            <EmptyState />
+          )}
+        </Box>
+      </Fragment>
     )
   }
 }
diff --git a/src/components/UpdateNotifier/UpdateDownloaded.js b/src/components/UpdateNotifier/UpdateDownloaded.js
index 9fcbb051..5f0cb77a 100644
--- a/src/components/UpdateNotifier/UpdateDownloaded.js
+++ b/src/components/UpdateNotifier/UpdateDownloaded.js
@@ -35,6 +35,7 @@ const Container = styled(Box).attrs({
   px: 3,
   bg: 'wallet',
   color: 'white',
+  mt: '-35px',
   style: p => ({
     transform: `translate3d(0, ${p.offset}%, 0)`,
   }),