Merge pull request #1813 from mparke/fix-plan-miscalculation

Fix plans, bump version, and update changelog
linode · May 18, 2017 · 963e3ac · 963e3ac
2 parents f5faa77 + c23fe9f
commit 963e3ac
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [0.5.3] 2017-05-18
+### Fixed
+- fixed miscalculated plan values #1811
+
 ## [0.5.2] 2017-05-18
 ### Fixed
 - fixed user restricted radio #1808

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "linode-manager",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "The Linode Manager website",
   "scripts": {
     "clean": "rm -rf dist",

diff --git a/src/linodes/components/Plan.js b/src/linodes/components/Plan.js
@@ -27,9 +27,9 @@ export default class Plan extends Component {
           </div>
         </header>
         <div className="option-contents">
-          <div className="pricing">${hourlyPrice / 100}/hr (${monthlyPrice / 100}/mo)</div>
+          <div className="pricing">${hourlyPrice}/hr (${monthlyPrice}/mo)</div>
           <hr />
-          <div className="cpu-ram">{plan.ram} GB / {plan.vcpus} CPU</div>
+          <div className="cpu-ram">{plan.ram / 1024} GB / {plan.vcpus} CPU</div>
           <div className="hdd">{Math.round(plan.storage / 1024)} GB SSD</div>
           <div className="transfer">{plan.transfer / 1000} TB Transfer</div>
         </div>