From fa188527757a9686be77af297c5d8f2cb9739f42 Mon Sep 17 00:00:00 2001
From: Daniel Odendahl Jr <danielbodendahl@gmail.com>
Date: Thu, 22 Mar 2018 20:26:14 +0000
Subject: [PATCH] Change order of currency and units arguments

---
 commands/number-edit/currency.js | 10 +++++-----
 commands/number-edit/units.js    | 10 +++++-----
 package.json                     |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/commands/number-edit/currency.js b/commands/number-edit/currency.js
index 49aaa59c..7afde0e1 100644
--- a/commands/number-edit/currency.js
+++ b/commands/number-edit/currency.js
@@ -13,6 +13,11 @@ module.exports = class CurrencyCommand extends Command {
 			description: 'Converts money from one currency to another.',
 			details: `**Codes**: ${codes.join(', ')}`,
 			args: [
+				{
+					key: 'amount',
+					prompt: 'How much money should be converted? Do not use symbols.',
+					type: 'float'
+				},
 				{
 					key: 'base',
 					prompt: `What currency code do you want to use as the base? Either ${list(codes, 'or')}.`,
@@ -32,11 +37,6 @@ module.exports = class CurrencyCommand extends Command {
 						return `Invalid target, please enter either ${list(codes, 'or')}.`;
 					},
 					parse: target => target.toUpperCase()
-				},
-				{
-					key: 'amount',
-					prompt: 'How much money should be converted? Do not use symbols.',
-					type: 'float'
 				}
 			]
 		});
diff --git a/commands/number-edit/units.js b/commands/number-edit/units.js
index 5f71a18e..4530b7ba 100644
--- a/commands/number-edit/units.js
+++ b/commands/number-edit/units.js
@@ -10,6 +10,11 @@ module.exports = class UnitsCommand extends Command {
 			memberName: 'units',
 			description: 'Converts units to/from other units.',
 			args: [
+				{
+					key: 'amount',
+					prompt: 'How many units should be converted?',
+					type: 'float'
+				},
 				{
 					key: 'base',
 					prompt: 'What unit type do you want to convert from?',
@@ -21,11 +26,6 @@ module.exports = class UnitsCommand extends Command {
 					prompt: 'What unit type do you want to convert to?',
 					type: 'string',
 					parse: target => target.toLowerCase()
-				},
-				{
-					key: 'amount',
-					prompt: 'How many units should be converted?',
-					type: 'float'
 				}
 			]
 		});
diff --git a/package.json b/package.json
index e264eefe..29cf584c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xiao",
-	"version": "69.5.0",
+	"version": "70.0.0",
 	"description": "Your personal server companion.",
 	"main": "Xiao.js",
 	"scripts": {