Merge pull request #823 from nos/develop

[RELEASE] redo 0.5.0
nos · Jan 13, 2019 · a91cbf5 · a91cbf5
2 parents 0f83544 + d31e8b0
commit a91cbf5
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 12 deletions.
diff --git a/src/main/index.js b/src/main/index.js
@@ -55,6 +55,7 @@ function createWindow() {
     titleBarStyle: 'customButtonsOnHover',
     show: false,
     frame: false,
+    transparent: true,
     icon: iconPath
   });
 

diff --git a/src/renderer/account/components/AccountPanel/Breakdown/BreakdownChart/BreakdownChart.js b/src/renderer/account/components/AccountPanel/Breakdown/BreakdownChart/BreakdownChart.js
@@ -31,7 +31,10 @@ export default class BreakdownChart extends React.PureComponent {
     const data = this.getData();
 
     return (
-      <ResponsiveContainer width="100%" className={classNames(styles.breakdownChart, this.props.className)}>
+      <ResponsiveContainer
+        width="100%"
+        className={classNames(styles.breakdownChart, this.props.className)}
+      >
         <PieChart>
           <Pie
             data={data}
@@ -66,13 +69,17 @@ export default class BreakdownChart extends React.PureComponent {
       return data;
     }
 
-    return [
-      ...data.splice(0, 2),
-      { symbol: 'OTHERS', value: reduceSum(data) }
-    ];
-  }
+    const spliced = [...data.splice(0, 2)];
+    const main = reduceSum(spliced);
+    const others = { symbol: 'OTHERS', value: reduceSum(data) };
+    if (others.value / main < 0.02) {
+      return [...spliced];
+    } else {
+      return [...spliced, others];
+    }
+  };
 
   formatValue = (value) => {
     return formatCurrency(value, this.props.currency);
-  }
+  };
 }
diff --git a/src/renderer/account/components/AccountPanel/Breakdown/SectionLabel/SectionLabel.js b/src/renderer/account/components/AccountPanel/Breakdown/SectionLabel/SectionLabel.js
@@ -7,14 +7,27 @@ import styles from './SectionLabel.scss';
 const RADIAN = Math.PI / 180;
 
 export default function SectionLabel(props) {
-  const { cx, cy, midAngle, outerRadius, percent, payload: { label } } = props;
+  const {
+    cx,
+    cy,
+    midAngle,
+    outerRadius,
+    percent,
+    payload: { label }
+  } = props;
   const radius = outerRadius + 25;
   const x = cx + radius * Math.cos(-midAngle * RADIAN);
   const y = cy + radius * Math.sin(-midAngle * RADIAN);
 
   return (
     <g className={styles.sectionLabel}>
-      <text x={x} y={y - 10} className={styles.percent} textAnchor="start" dominantBaseline="central">
+      <text
+        x={x}
+        y={y - 10}
+        className={styles.percent}
+        textAnchor="start"
+        dominantBaseline="central"
+      >
         {`${(percent * 100).toFixed(0)}%`}
       </text>
       <text x={x} y={y + 10} className={styles.label} textAnchor="start" dominantBaseline="central">

diff --git a/static/splash.html b/static/splash.html
@@ -22,9 +22,9 @@
     <style>
       html,
       body {
-        background-color: #000;
-        width: 100%;
-        height: 100%;
+        background-color: transparent;
+        width: 98%;
+        height: 98%;
         margin: 0;
         overflow: hidden;
         font-family: "Rubik", sans-serif;