diff --git a/src/forms/Predictions.js b/src/forms/Predictions.js
index a47a6072..a84716e6 100644
--- a/src/forms/Predictions.js
+++ b/src/forms/Predictions.js
@@ -44,7 +44,7 @@ const IncomeForm = function ({ future, time, updateClientValue, snippets }) {
time={ time }
updateClientValue = { updateClientValue }
generic='earned'
- labelInfo='(Weekly income = hourly wage times average number of work hours per week)'>
+ labelInfo='(Weekly pay = hourly wage times average number of work hours per week)'>
{ snippets.i_futureIncomeQuestion }
diff --git a/src/forms/output/BenefitsLineGraph.js b/src/forms/output/BenefitsLineGraph.js
index f6820450..e5d34fa0 100644
--- a/src/forms/output/BenefitsLineGraph.js
+++ b/src/forms/output/BenefitsLineGraph.js
@@ -47,7 +47,7 @@ class BenefitsLineGraph extends Component {
var max = Math.ceil((limits.max * multiplier) / 100) * 100,
interval = Math.ceil((max / 100) / 10) * 10;
- var xRange = _.range(limits.min, max, interval), // x-axis/income numbers
+ var xRange = _.range(limits.min, max, interval), // x-axis/earned income numbers
extraProps = { snap: { fill: false }, section8: { fill: false }},
datasets = getChartData(xRange, multiplier, client, activePrograms, extraProps);
@@ -58,10 +58,10 @@ class BenefitsLineGraph extends Component {
// react-chartjs-2 keeps references to plugins, so we
// have to mutate that reference
- var income = client.future.earned * multiplier,
+ var earned = client.future.earned * multiplier,
hack = this.state.verticalLine;
hack.xRange = xRange;
- hack.income = income;
+ hack.earned = earned;
var lineProps = {
data: {
@@ -71,7 +71,7 @@ class BenefitsLineGraph extends Component {
options: {
title: {
display: true,
- text: 'Individual Benefit Amounts for Household as Income Changes',
+ text: 'Individual Benefit Amounts for Household as Pay Changes',
},
showLines: true,
scales: {
@@ -92,7 +92,7 @@ class BenefitsLineGraph extends Component {
{
scaleLabel: {
display: true,
- labelString: timescale + ' Income ($)',
+ labelString: timescale + ' Pay ($)',
},
ticks: { callback: formatAxis },
},
diff --git a/src/forms/output/BenefitsTable.js b/src/forms/output/BenefitsTable.js
index 92ab94c9..fc0e3ada 100644
--- a/src/forms/output/BenefitsTable.js
+++ b/src/forms/output/BenefitsTable.js
@@ -26,7 +26,7 @@ const BenefitsTable = function ({ client, snippets }) {
var curr = clone.current;
var allData = {},
- activeBenefits = [ `income` ];
+ activeBenefits = [ `earned` ];
if (curr.hasSection8) {
activeBenefits.push(`section8`);
@@ -54,7 +54,7 @@ const BenefitsTable = function ({ client, snippets }) {
applyAndPushBenefits (futureCalcData);
// @todo Abstract getting values for each row
- var income = allData.income,
+ var earned = allData.earned,
section8 = allData.section8,
snap = allData.snap;
@@ -78,12 +78,12 @@ const BenefitsTable = function ({ client, snippets }) {
totalBenefitCurrent = SNAPBenefitCurrent + sec8BenefitCurrent,
totalBenefitFuture = SNAPBenefitFuture + sec8BenefitFuture,
totalDiff = SNAPDiff + sec8Diff,
- incomeCurrent = Math.round(income[ 0 ]),
- incomeFuture = Math.round(income[ 1 ]),
- incomeDiff = incomeFuture - incomeCurrent,
- netCurrent = totalBenefitCurrent + incomeCurrent,
- netFuture = totalBenefitFuture + incomeFuture,
- netDiff = totalDiff + incomeDiff;
+ earnedCurrent = Math.round(earned[ 0 ]),
+ earnedFuture = Math.round(earned[ 1 ]),
+ earnedDiff = earnedFuture - earnedCurrent,
+ netCurrent = totalBenefitCurrent + earnedCurrent,
+ netFuture = totalBenefitFuture + earnedFuture,
+ netDiff = totalDiff + earnedDiff;
const columnHeaderStyle = {
background: 'rgba(0, 181, 173, 1)',
@@ -176,13 +176,13 @@ const BenefitsTable = function ({ client, snippets }) {
);
};
- const IncomeRow = function ({ snippets }) {
+ const EarnedRow = function ({ snippets }) {
return (
- { snippets.i_rowIncome }
- { snippets.i_beforeMoney }{incomeCurrent}{ snippets.i_afterMoney }
- { snippets.i_beforeMoney }{incomeFuture}{ snippets.i_afterMoney }
- { getSignSymbol(incomeDiff) } { snippets.i_beforeMoney }{ Math.abs(incomeDiff) }{ snippets.i_afterMoney }
+ { snippets.i_rowEarned }
+ { snippets.i_beforeMoney }{earnedCurrent}{ snippets.i_afterMoney }
+ { snippets.i_beforeMoney }{earnedFuture}{ snippets.i_afterMoney }
+ { getSignSymbol(earnedDiff) } { snippets.i_beforeMoney }{ Math.abs(earnedDiff) }{ snippets.i_afterMoney }
);
};
@@ -247,7 +247,7 @@ const BenefitsTable = function ({ client, snippets }) {
-
+
diff --git a/src/forms/output/StackedAreaGraph.js b/src/forms/output/StackedAreaGraph.js
index d238798c..348e36fd 100644
--- a/src/forms/output/StackedAreaGraph.js
+++ b/src/forms/output/StackedAreaGraph.js
@@ -47,24 +47,24 @@ class StackedAreaGraph extends Component {
const { client, timescale, activePrograms } = this.props;
const multiplier = multipliers[ timescale ];
- var withIncome = activePrograms.slice();
- withIncome.unshift('income');
+ var withEarned = activePrograms.slice();
+ withEarned.unshift('earned');
// Adjust to time-interval, round to hundreds
- var income = client.future.earned * multiplier,
- max = Math.max(income, limits.max * multiplier),
+ var earned = client.future.earned * multiplier,
+ max = Math.max(earned, limits.max * multiplier),
xMax = Math.ceil(max / 100) * 100,
xMin = Math.ceil(limits.min * multiplier / 100) * 100,
interval = Math.ceil(((xMax - xMin) / 100) / 10) * 10,
xRange = _.range(xMin, xMax + interval, interval),
- extraProps = { income: { fill: 'origin' }},
- datasets = getChartData(xRange, multiplier, client, withIncome, extraProps);
+ extraProps = { earned: { fill: 'origin' }},
+ datasets = getChartData(xRange, multiplier, client, withEarned, extraProps);
// react-chartjs-2 keeps references to plugins, so we
// have to mutate that reference
var hack = this.state.verticalLine;
hack.xRange = xRange;
- hack.income = income;
+ hack.earned = earned;
var stackedAreaProps = {
data: {
@@ -74,7 +74,7 @@ class StackedAreaGraph extends Component {
options: {
title: {
display: true,
- text: 'All Money Coming in as Income Changes',
+ text: 'All Money Coming in as Pay Changes',
}, // end `title`
elements: {
line: { fill: '-1' },
@@ -103,7 +103,7 @@ class StackedAreaGraph extends Component {
stacked: true,
scaleLabel: {
display: true,
- labelString: timescale + ' Income ($)',
+ labelString: timescale + ' Earned ($)',
},
ticks: { callback: formatAxis },
},
diff --git a/src/forms/output/StackedBarGraph.js b/src/forms/output/StackedBarGraph.js
index da59583e..78ae7f80 100644
--- a/src/forms/output/StackedBarGraph.js
+++ b/src/forms/output/StackedBarGraph.js
@@ -32,7 +32,7 @@ const StackedBarGraph = function({ client }) {
curr = clone.current;
var allData = {},
- activeBenefits = [ `income` ];
+ activeBenefits = [ `earned` ];
if (curr.hasSection8) {
activeBenefits.push(`section8`);
@@ -70,7 +70,7 @@ const StackedBarGraph = function({ client }) {
data: allData[ bName ],
};
- if (bName === `income`) {
+ if (bName === `earned`) {
dataset.fill = `origin`;
for (let amount of dataset.data) {
moneyLabels.push(Math.round(amount));
@@ -88,7 +88,7 @@ const StackedBarGraph = function({ client }) {
options: {
title: {
display: true,
- text: 'Money Coming In as Income Changes',
+ text: 'Money Coming In as Pay Changes',
},
scales: {
yAxes: [
@@ -109,7 +109,7 @@ const StackedBarGraph = function({ client }) {
stacked: true,
scaleLabel: {
display: true,
- labelString: 'Monthly Income ($)',
+ labelString: 'Monthly Pay ($)',
},
ticks: { callback: formatAxis },
},
diff --git a/src/forms/output/Summary.js b/src/forms/output/Summary.js
index d976a9a6..f3530c49 100644
--- a/src/forms/output/Summary.js
+++ b/src/forms/output/Summary.js
@@ -51,11 +51,11 @@ var totalLastItemsOfArraysInObject = function (accumulated) {
* those benefits.
*
* @param {array} keys Contains keys to use on `sourceObject`.
- * @param {object} sourceObject MUST CONTAIN `income` property!
- * Contains `income` and benefit keys that each have an
+ * @param {object} sourceObject MUST CONTAIN `earned` property!
+ * Contains `earned` and benefit keys that each have an
* array of numerical values (which are meant to be money
* values right now).
- * @param {array} sourceObject.income Earned income values.
+ * @param {array} sourceObject.earned Earned income values.
* @param {int} Which item in each array should be used to
* accumulate values.
*
@@ -73,7 +73,7 @@ var totalLastItemsOfArraysInObject = function (accumulated) {
* ];
*
* let accumulated = {
- * income: [ 450, 500 ],
+ * earned: [ 450, 500 ],
* benefit1: [ 80, 30 ],
* benefit2: [ 40, 10 ],
* };
@@ -112,8 +112,8 @@ var totalLastItemsOfArraysInObject = function (accumulated) {
*/
var fillInMoneyValues = (keys, sourceObject, index) => {
- if (!Array.isArray(sourceObject.income)) {
- throw new TypeError(`The given resources object requires an 'income' property that is an array of numbers.`);
+ if (!Array.isArray(sourceObject.earned)) {
+ throw new TypeError(`The given resources object requires an 'earned' property that is an array of numbers.`);
}
var moneyValues = {
@@ -123,18 +123,18 @@ var fillInMoneyValues = (keys, sourceObject, index) => {
total: 0,
};
- // Item names can be `income` or benefit keys
+ // Item names can be `earned` or benefit keys
for (let itemKey of keys) {
let amount = sourceObject[ itemKey ][ index ];
- if (itemKey === `income`) {
+ if (itemKey === `earned`) {
moneyValues.earned = amount;
} else {
moneyValues.benefits.push({
label: PROGRAM_CHART_VALUES[ itemKey ].name,
amount: amount,
});
- // Add up all benefits (we're not including income)
+ // Add up all benefits (we're not including earned income)
moneyValues.benefitsTotal += amount;
}
} // ends for every item key name
@@ -155,7 +155,7 @@ var fillInMoneyValues = (keys, sourceObject, index) => {
* @param {Array.} resourceKeys List of...
* 'programs'... in the order in which we eventually
* want to show them. It often also includes
- * 'income' as the first value, so it's not a list
+ * 'earned' as the first value, so it's not a list
* of 'benefit programs' per se.
*
* @example
@@ -163,7 +163,7 @@ var fillInMoneyValues = (keys, sourceObject, index) => {
* // This example uses the sample `client` data from row 3,
* // column 'clientData' here:
* // https://docs.google.com/spreadsheets/d/15LyR9yELAfcngj-c7vMdI630b6DwuuXV-dQEJDvU4gE/edit?usp=sharing
- * var items = [ 'income', 'section8', 'snap' ];
+ * var items = [ 'earned', 'section8', 'snap' ];
* var data = getBenefitData(client, items);
* console.log(data);
* // {
@@ -214,10 +214,10 @@ var getBenefitData = function(client, resourceKeys) {
applyAndPushBenefits(currentCalcData);
var futureCalcData = { ...defaultProps, timeframe: `future` };
applyAndPushBenefits(futureCalcData);
- // Now have: { income: [c, f], n: [c, f], ... }
+ // Now have: { earned: [c, f], n: [c, f], ... }
// 2. Get totals
- // Fill income values for both current and future income objects
+ // Fill earned values for both current and future earned objects
result.current = fillInMoneyValues(resourceKeys, accumulated, 0);
result.future = fillInMoneyValues(resourceKeys, accumulated, 1);
var resultCurr = result.current,
@@ -229,7 +229,7 @@ var getBenefitData = function(client, resourceKeys) {
// 4. If implicit taxes > 100% (has dramatic cliff)
let recoveryAmount = 0,
- income = accumulated.income;
+ earned = accumulated.earned;
if (result.diff <= 0) {
// 5. The lowest point in their cliff is behind -
// as is the nature of cliffs. Now try getting raises
@@ -243,7 +243,7 @@ var getBenefitData = function(client, resourceKeys) {
} // ends while making less money than now
result.recovery.total = recoveryAmount;
- result.recovery.earned = income[ income.length - 1 ];
+ result.recovery.earned = earned[ earned.length - 1 ];
} // ends if hit dramatic cliff
@@ -271,7 +271,7 @@ var getBenefitData = function(client, resourceKeys) {
*/
const Summary = function ({ client, openFeedback, snippets }) {
- var resourceKeys = [ `income` ];
+ var resourceKeys = [ `earned` ];
// Benefits, in order of appearance
// So can't wait till `.benefits` is an array of benefit names...
if (client.current.hasSection8) {
diff --git a/src/forms/output/VerticalLine.js b/src/forms/output/VerticalLine.js
index db0fe456..1f6cbaec 100644
--- a/src/forms/output/VerticalLine.js
+++ b/src/forms/output/VerticalLine.js
@@ -10,17 +10,17 @@ class VerticalLine {
constructor () {
this.xRange = [];
- this.income = 0;
+ this.earned = 0;
}
afterDatasetsDraw = (chart) => {
const xRange = this.xRange,
- income = this.income;
+ earned = this.earned;
const i = xRange.findIndex((val) => {
- return income < val;
+ return earned < val;
});
- const positionBetweenTwoPoints = (income - xRange[ i - 1 ]) / (xRange[ i ] - xRange[ i - 1 ]);
+ const positionBetweenTwoPoints = (earned - xRange[ i - 1 ]) / (xRange[ i ] - xRange[ i - 1 ]);
const data = chart.getDatasetMeta(0).data;
const prevX = data[ i - 1 ]._model.x;
@@ -49,7 +49,7 @@ class VerticalLine {
const xMargin = 5;
const yMargin = 200;
ctx.fillText('Future', offset + xMargin, yMargin);
- ctx.fillText('Income', offset + xMargin, lineHeight + yMargin);
+ ctx.fillText('Pay', offset + xMargin, lineHeight + yMargin);
ctx.restore();
};
diff --git a/src/localization/en.js b/src/localization/en.js
index fd1d1a09..e40274a7 100644
--- a/src/localization/en.js
+++ b/src/localization/en.js
@@ -309,28 +309,28 @@ export default {
rowSNAP_v1: `SNAP`, // see BenefitsTable.js
rowSection8_v1: `Section 8 Housing`, // see BenefitsTable.js
rowTotalBenefits_v1: `Total Benefits`, // see BenefitsTable.js
- rowIncome_v1: `Income`, // see BenefitsTable.js
+ rowEarned_v2: `Earned`, // see BenefitsTable.js
rowNetTotal_v1: `Net Total`, // see BenefitsTable.js
beforeMoney_v1: `$`, // see BenefitsTable.js multiple lines
afterMoney_v1: ` / month`, // see BenefitsTable.js multiple lines
// Stacked Bar Graph:
stackedBarGraphTitle_v1: `Changes Chart`, // see line 266 above
- moneyInAsIncomeChanges_v1: `Money Coming In as Income Changes`, // see StackedBarGraph.js
+ moneyInAsPayChanges_v2: `Money Coming In as Pay Changes`, // see StackedBarGraph.js
// Stacked Area Graph:
stackedAreaGraphTitle_v1: `Stacked Incomes`, // see line 267 above
- allMoneyComingIn_v1: `All Money Coming In as Income Changes`, // see StackedAreaGraph.js
+ allMoneyComingIn_v2: `All Money Coming In as Pay Changes`, // see StackedAreaGraph.js
// Benefit Programs Graph, showing benefit programs as lines not areas:
- benefitProgramsTitle_v1: `Individual Benefit Amounts for Household as Income Changes`, // maybe rename as benefitProgramsSubTitle_v1 ? see also BenefitsLineGraph.js
+ benefitProgramsTitle_v2: `Individual Benefit Amounts for Household as Pay Changes`, // maybe rename as benefitProgramsSubTitle_v1 ? see also BenefitsLineGraph.js
benefitValue_v1: `Benefit Value ($)`, // see BenefitsLineGraph.js
// Snippets that are used in more than one chart, table, or graph:
totalMoney_v1: `Total Money Coming In ($)`, // see StackedAreaGraph.js, StackedBarGraph.js
- weeklyIncome_v1: `Weekly Income ($)`,
- monthlyIncome_v1: `Monthly Income ($)`,
- yearlyIncome_v1: `Yearly Income ($)`,
- hasIncome_v1: `Income`,
+ weeklyPay_v2: `Weekly Pay ($)`,
+ monthlyPay_v2: `Monthly Pay ($)`,
+ yearlyPay_v2: `Yearly Pay ($)`,
+ hasPay_v2: `Pay`,
hasSNAP_v1: `SNAP`,
hasSection8_v1: `Section 8`,
- futureIncomeLine_v1: `Future Income`, // see VerticalLine.js
+ futurePayLine_v2: `Future Pay`, // see VerticalLine.js
buttonWeekly_v1: `Weekly`, // see cashflow.js, GraphTimeButtons
buttonMonthly_v1: `Monthly`, // see cashflow.js, GraphTimeButtons
buttonYearly_v1: `Yearly`, // see cashflow.js, GraphTimeButtons
diff --git a/src/localization/vi.js b/src/localization/vi.js
index c86f1543..8522b797 100644
--- a/src/localization/vi.js
+++ b/src/localization/vi.js
@@ -274,31 +274,31 @@ export default {
'rowSNAP_v1': `Chương Trình Phiếu Mua Hàng SNAP`,
'rowSection8_v1': `Chương Trình Section 8 Housing`,
'rowTotalBenefits_v1': `Tổng Lợi Ích`,
- 'rowIncome_v1': `Tiền Thu Nhập`,
- 'rowNetTotal_v1': `Tổng số tiền sau khi chi phí`,
- 'beforeMoney_v1': ` / tháng`,
- 'afterMoney_v1': `$`,
+ rowEarned_v1: `Tiền Thu Nhập`,
+ rowNetTotal_v1: `Tổng số tiền sau khi chi phí`,
+ beforeMoney_v1: ` / tháng`,
+ afterMoney_v1: `$`,
- 'stackedBarGraphTitle_v1': `Đồ Thị Về Việc Thay Đổi`,
- 'moneyInAsIncomeChanges_v1': `Tiền Nhận Được Lúc Mà Thay Đổi Thu Nhập`,
+ stackedBarGraphTitle_v1: `Đồ Thị Về Việc Thay Đổi`,
+ moneyInAsPayChanges_v1: `Tiền Nhận Được Lúc Mà Thay Đổi Thu Nhập`,
- 'stackedAreaGraphTitle_v1': `Xếp Chồng Tiền Thu Nhập Lên Nhau`,
- 'allMoneyComingIn_v1': `Tổng Tiền Nhận Được Lúc Mà Thay Đổi Thu Nhập`,
+ stackedAreaGraphTitle_v1: `Xếp Chồng Tiền Thu Nhập Lên Nhau`,
+ allMoneyComingIn_v1: `Tổng Tiền Nhận Được Lúc Mà Thay Đổi Thu Nhập`,
- 'benefitProgramsTitle_v1': `Số tiền trợ cấp của cá nhân nhận được cho gia đình lúc mà thay đổi thu nhập`,
- 'benefitValue_v1': `Giá Trị Của Lợi Ích ($)`,
+ benefitProgramsTitle_v1: `Số tiền trợ cấp của cá nhân nhận được cho gia đình lúc mà thay đổi thu nhập`,
+ benefitValue_v1: `Giá Trị Của Lợi Ích ($)`,
- 'totalMoney_v1': `Tổng Số Tiền Nhận Được ($)`,
- 'weeklyIncome_v1': `Tiền Lương Hàng Tuần ($)`,
- 'monthlyIncome_v1': `Tiền Lương Hàng Tháng ($)`,
- 'yearlyIncome_v1': `Tiền Lương Hàng Năm ($)`,
- 'hasIncome_v1': `Tiền Lương`,
- 'hasSNAP_v1': `Chương Trình Phiếu Mua Hàng SNAP`,
- 'hasSection8_v1': `Chương Trình Section 8 Housing`,
- 'futureIncomeLine_v1': `Tiền Lương Trong Tương Lai`,
- 'buttonWeekly_v1': `Hàng Tuần`,
- 'buttonMonthly_v1': `Hàng Tháng`,
- 'buttonYearly_v1': `Hàng Năm`,
+ totalMoney_v1: `Tổng Số Tiền Nhận Được ($)`,
+ weeklyPay_v1: `Tiền Lương Hàng Tuần ($)`,
+ monthlyPay_v1: `Tiền Lương Hàng Tháng ($)`,
+ yearlyPay_v1: `Tiền Lương Hàng Năm ($)`,
+ hasPay_v1: `Tiền Lương`,
+ hasSNAP_v1: `Chương Trình Phiếu Mua Hàng SNAP`,
+ hasSection8_v1: `Chương Trình Section 8 Housing`,
+ futurePayLine_v1: `Tiền Lương Trong Tương Lai`,
+ buttonWeekly_v1: `Hàng Tuần`,
+ buttonMonthly_v1: `Hàng Tháng`,
+ buttonYearly_v1: `Hàng Năm`,
},
},
};
diff --git a/src/localization/zh.js b/src/localization/zh.js
index 0030dc37..6776e631 100644
--- a/src/localization/zh.js
+++ b/src/localization/zh.js
@@ -252,7 +252,7 @@ export default {
'rowSNAP_v1': `SNAP 糧食劵`,
'rowSection8_v1': `Section 8 住房`,
'rowTotalBenefits_v1': `補助總額`,
- 'rowIncome_v1': `收入`,
+ 'rowEarned_v1': `收入`,
'rowNetTotal_v1': `净總額`,
'beforeMoney_v1': `$`,
'afterMoney_v1': ` /月`,
@@ -266,17 +266,17 @@ export default {
'benefitProgramsTitle_v1': `單獨補助額度，根據家庭收入變化`,
'benefitValue_v1': `補助額度 ($)`,
- 'totalMoney_v1': `總收入 ($)`,
- 'weeklyIncome_v1': `周收入 ($)`,
- 'monthlyIncome_v1': `月收入 ($)`,
- 'yearlyIncome_v1': `年收入 ($)`,
- 'hasIncome_v1': `收入`,
- 'hasSNAP_v1': `SNAP 糧食劵`,
- 'hasSection8_v1': `Section 8 住房`,
- 'futureIncomeLine_v1': `未來收入`,
- 'buttonWeekly_v1': `每周`,
- 'buttonMonthly_v1': `每月`,
- 'buttonYearly_v1': `每年`,
+ 'totalMoney_v1': `總收入 ($)`,
+ 'weeklyPay_v1': `周收入 ($)`,
+ 'monthlyPay_v1': `月收入 ($)`,
+ 'yearlyPay_v1': `年收入 ($)`,
+ 'hasPay_v1': `收入`,
+ 'hasSNAP_v1': `SNAP 糧食劵`,
+ 'hasSection8_v1': `Section 8 住房`,
+ 'futurePayLine_v1': `未來收入`,
+ 'buttonWeekly_v1': `每周`,
+ 'buttonMonthly_v1': `每月`,
+ 'buttonYearly_v1': `每年`,
},
},
};
diff --git a/src/programs/applyAndPushBenefits.js b/src/programs/applyAndPushBenefits.js
index 64b9a86c..f9738181 100644
--- a/src/programs/applyAndPushBenefits.js
+++ b/src/programs/applyAndPushBenefits.js
@@ -3,9 +3,9 @@ import { allBenefitOrders } from './allBenefitOrders';
import { allBenefitOps } from './allBenefitOps';
-var baseBenefits = [ `income` ];
+var baseBenefits = [ `earned` ];
var baseOps = {
- income: {
+ earned: {
calc: function (client, timeframe) {
return client[ timeframe ].earned;
},
diff --git a/src/test/forms/output/__snapshots__/BenefitsLineGraph.test.js.snap b/src/test/forms/output/__snapshots__/BenefitsLineGraph.test.js.snap
index 2b16bdbf..c085aacd 100644
--- a/src/test/forms/output/__snapshots__/BenefitsLineGraph.test.js.snap
+++ b/src/test/forms/output/__snapshots__/BenefitsLineGraph.test.js.snap
@@ -443,7 +443,7 @@ exports[` renders with both snap and section8 1`] = `
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Pay ($)",
},
"ticks": Object {
"callback": [Function],
@@ -466,7 +466,7 @@ exports[` renders with both snap and section8 1`] = `
"showLines": true,
"title": Object {
"display": true,
- "text": "Individual Benefit Amounts for Household as Income Changes",
+ "text": "Individual Benefit Amounts for Household as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -480,7 +480,7 @@ exports[` renders with both snap and section8 1`] = `
Array [
VerticalLine {
"afterDatasetsDraw": [Function],
- "income": 200,
+ "earned": 200,
"xRange": Array [
0,
90,
@@ -895,7 +895,7 @@ exports[` renders with both snap and section8 1`] = `
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Pay ($)",
},
"ticks": Object {
"callback": [Function],
@@ -918,7 +918,7 @@ exports[` renders with both snap and section8 1`] = `
"showLines": true,
"title": Object {
"display": true,
- "text": "Individual Benefit Amounts for Household as Income Changes",
+ "text": "Individual Benefit Amounts for Household as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -932,7 +932,7 @@ exports[` renders with both snap and section8 1`] = `
Array [
VerticalLine {
"afterDatasetsDraw": [Function],
- "income": 200,
+ "earned": 200,
"xRange": Array [
0,
90,
@@ -1377,7 +1377,7 @@ exports[` renders with section8 1`] = `
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Pay ($)",
},
"ticks": Object {
"callback": [Function],
@@ -1400,7 +1400,7 @@ exports[` renders with section8 1`] = `
"showLines": true,
"title": Object {
"display": true,
- "text": "Individual Benefit Amounts for Household as Income Changes",
+ "text": "Individual Benefit Amounts for Household as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -1414,7 +1414,7 @@ exports[` renders with section8 1`] = `
Array [
VerticalLine {
"afterDatasetsDraw": [Function],
- "income": 200,
+ "earned": 200,
"xRange": Array [
0,
90,
@@ -1727,7 +1727,7 @@ exports[` renders with section8 1`] = `
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Pay ($)",
},
"ticks": Object {
"callback": [Function],
@@ -1750,7 +1750,7 @@ exports[` renders with section8 1`] = `
"showLines": true,
"title": Object {
"display": true,
- "text": "Individual Benefit Amounts for Household as Income Changes",
+ "text": "Individual Benefit Amounts for Household as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -1764,7 +1764,7 @@ exports[` renders with section8 1`] = `
Array [
VerticalLine {
"afterDatasetsDraw": [Function],
- "income": 200,
+ "earned": 200,
"xRange": Array [
0,
90,
@@ -2209,7 +2209,7 @@ exports[` renders with snap and current earned greater than f
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Pay ($)",
},
"ticks": Object {
"callback": [Function],
@@ -2232,7 +2232,7 @@ exports[` renders with snap and current earned greater than f
"showLines": true,
"title": Object {
"display": true,
- "text": "Individual Benefit Amounts for Household as Income Changes",
+ "text": "Individual Benefit Amounts for Household as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -2246,7 +2246,7 @@ exports[` renders with snap and current earned greater than f
Array [
VerticalLine {
"afterDatasetsDraw": [Function],
- "income": 100,
+ "earned": 100,
"xRange": Array [
0,
90,
@@ -2559,7 +2559,7 @@ exports[` renders with snap and current earned greater than f
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Pay ($)",
},
"ticks": Object {
"callback": [Function],
@@ -2582,7 +2582,7 @@ exports[` renders with snap and current earned greater than f
"showLines": true,
"title": Object {
"display": true,
- "text": "Individual Benefit Amounts for Household as Income Changes",
+ "text": "Individual Benefit Amounts for Household as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -2596,7 +2596,7 @@ exports[` renders with snap and current earned greater than f
Array [
VerticalLine {
"afterDatasetsDraw": [Function],
- "income": 100,
+ "earned": 100,
"xRange": Array [
0,
90,
@@ -3041,7 +3041,7 @@ exports[` renders with snap and current earned less than futu
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Pay ($)",
},
"ticks": Object {
"callback": [Function],
@@ -3064,7 +3064,7 @@ exports[` renders with snap and current earned less than futu
"showLines": true,
"title": Object {
"display": true,
- "text": "Individual Benefit Amounts for Household as Income Changes",
+ "text": "Individual Benefit Amounts for Household as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -3078,7 +3078,7 @@ exports[` renders with snap and current earned less than futu
Array [
VerticalLine {
"afterDatasetsDraw": [Function],
- "income": 200,
+ "earned": 200,
"xRange": Array [
0,
90,
@@ -3391,7 +3391,7 @@ exports[` renders with snap and current earned less than futu
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Pay ($)",
},
"ticks": Object {
"callback": [Function],
@@ -3414,7 +3414,7 @@ exports[` renders with snap and current earned less than futu
"showLines": true,
"title": Object {
"display": true,
- "text": "Individual Benefit Amounts for Household as Income Changes",
+ "text": "Individual Benefit Amounts for Household as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -3428,7 +3428,7 @@ exports[` renders with snap and current earned less than futu
Array [
VerticalLine {
"afterDatasetsDraw": [Function],
- "income": 200,
+ "earned": 200,
"xRange": Array [
0,
90,
diff --git a/src/test/forms/output/__snapshots__/StackedAreaGraph.test.js.snap b/src/test/forms/output/__snapshots__/StackedAreaGraph.test.js.snap
index 02aff3ba..3eeb3a85 100644
--- a/src/test/forms/output/__snapshots__/StackedAreaGraph.test.js.snap
+++ b/src/test/forms/output/__snapshots__/StackedAreaGraph.test.js.snap
@@ -233,7 +233,7 @@ exports[` renders with both snap and section8 1`] = `
8460,
],
"fill": "origin",
- "label": "Income",
+ "label": "Earned",
},
Object {
"backgroundColor": "rgba(101, 47, 138, 1)",
@@ -556,7 +556,7 @@ exports[` renders with both snap and section8 1`] = `
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Earned ($)",
},
"stacked": true,
"ticks": Object {
@@ -580,7 +580,7 @@ exports[` renders with both snap and section8 1`] = `
},
"title": Object {
"display": true,
- "text": "All Money Coming in as Income Changes",
+ "text": "All Money Coming in as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -594,7 +594,7 @@ exports[` renders with both snap and section8 1`] = `
Array [
VerticalLine {
"afterDatasetsDraw": [Function],
- "income": 200,
+ "earned": 200,
"xRange": Array [
0,
90,
@@ -802,7 +802,7 @@ exports[` renders with both snap and section8 1`] = `
8460,
],
"fill": "origin",
- "label": "Income",
+ "label": "Earned",
},
Object {
"backgroundColor": "rgba(101, 47, 138, 1)",
@@ -1125,7 +1125,7 @@ exports[` renders with both snap and section8 1`] = `
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Earned ($)",
},
"stacked": true,
"ticks": Object {
@@ -1149,7 +1149,7 @@ exports[` renders with both snap and section8 1`] = `
},
"title": Object {
"display": true,
- "text": "All Money Coming in as Income Changes",
+ "text": "All Money Coming in as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -1163,7 +1163,7 @@ exports[` renders with both snap and section8 1`] = `
Array [
VerticalLine {
"afterDatasetsDraw": [Function],
- "income": 200,
+ "earned": 200,
"xRange": Array [
0,
90,
@@ -1502,7 +1502,7 @@ exports[` renders with section8 1`] = `
8460,
],
"fill": "origin",
- "label": "Income",
+ "label": "Earned",
},
Object {
"backgroundColor": "rgba(206, 203, 61, 1)",
@@ -1723,7 +1723,7 @@ exports[` renders with section8 1`] = `
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Earned ($)",
},
"stacked": true,
"ticks": Object {
@@ -1747,7 +1747,7 @@ exports[` renders with section8 1`] = `
},
"title": Object {
"display": true,
- "text": "All Money Coming in as Income Changes",
+ "text": "All Money Coming in as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -1761,7 +1761,7 @@ exports[` renders with section8 1`] = `
Array [
VerticalLine {
"afterDatasetsDraw": [Function],
- "income": 200,
+ "earned": 200,
"xRange": Array [
0,
90,
@@ -1969,7 +1969,7 @@ exports[` renders with section8 1`] = `
8460,
],
"fill": "origin",
- "label": "Income",
+ "label": "Earned",
},
Object {
"backgroundColor": "rgba(206, 203, 61, 1)",
@@ -2190,7 +2190,7 @@ exports[` renders with section8 1`] = `
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Earned ($)",
},
"stacked": true,
"ticks": Object {
@@ -2214,7 +2214,7 @@ exports[` renders with section8 1`] = `
},
"title": Object {
"display": true,
- "text": "All Money Coming in as Income Changes",
+ "text": "All Money Coming in as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -2228,7 +2228,7 @@ exports[` renders with section8 1`] = `
Array [
VerticalLine {
"afterDatasetsDraw": [Function],
- "income": 200,
+ "earned": 200,
"xRange": Array [
0,
90,
@@ -2567,7 +2567,7 @@ exports[` renders with snap and current earned greater than fu
8460,
],
"fill": "origin",
- "label": "Income",
+ "label": "Earned",
},
Object {
"backgroundColor": "rgba(101, 47, 138, 1)",
@@ -2788,7 +2788,7 @@ exports[` renders with snap and current earned greater than fu
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Earned ($)",
},
"stacked": true,
"ticks": Object {
@@ -2812,7 +2812,7 @@ exports[` renders with snap and current earned greater than fu
},
"title": Object {
"display": true,
- "text": "All Money Coming in as Income Changes",
+ "text": "All Money Coming in as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -2826,7 +2826,7 @@ exports[` renders with snap and current earned greater than fu
Array [
VerticalLine {
"afterDatasetsDraw": [Function],
- "income": 100,
+ "earned": 100,
"xRange": Array [
0,
90,
@@ -3034,7 +3034,7 @@ exports[` renders with snap and current earned greater than fu
8460,
],
"fill": "origin",
- "label": "Income",
+ "label": "Earned",
},
Object {
"backgroundColor": "rgba(101, 47, 138, 1)",
@@ -3255,7 +3255,7 @@ exports[` renders with snap and current earned greater than fu
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Earned ($)",
},
"stacked": true,
"ticks": Object {
@@ -3279,7 +3279,7 @@ exports[` renders with snap and current earned greater than fu
},
"title": Object {
"display": true,
- "text": "All Money Coming in as Income Changes",
+ "text": "All Money Coming in as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -3293,7 +3293,7 @@ exports[` renders with snap and current earned greater than fu
Array [
VerticalLine {
"afterDatasetsDraw": [Function],
- "income": 100,
+ "earned": 100,
"xRange": Array [
0,
90,
@@ -3632,7 +3632,7 @@ exports[` renders with snap and current earned less than futur
8460,
],
"fill": "origin",
- "label": "Income",
+ "label": "Earned",
},
Object {
"backgroundColor": "rgba(101, 47, 138, 1)",
@@ -3853,7 +3853,7 @@ exports[` renders with snap and current earned less than futur
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Earned ($)",
},
"stacked": true,
"ticks": Object {
@@ -3877,7 +3877,7 @@ exports[` renders with snap and current earned less than futur
},
"title": Object {
"display": true,
- "text": "All Money Coming in as Income Changes",
+ "text": "All Money Coming in as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -3891,7 +3891,7 @@ exports[` renders with snap and current earned less than futur
Array [
VerticalLine {
"afterDatasetsDraw": [Function],
- "income": 200,
+ "earned": 200,
"xRange": Array [
0,
90,
@@ -4099,7 +4099,7 @@ exports[` renders with snap and current earned less than futur
8460,
],
"fill": "origin",
- "label": "Income",
+ "label": "Earned",
},
Object {
"backgroundColor": "rgba(101, 47, 138, 1)",
@@ -4320,7 +4320,7 @@ exports[` renders with snap and current earned less than futur
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Earned ($)",
},
"stacked": true,
"ticks": Object {
@@ -4344,7 +4344,7 @@ exports[` renders with snap and current earned less than futur
},
"title": Object {
"display": true,
- "text": "All Money Coming in as Income Changes",
+ "text": "All Money Coming in as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -4358,7 +4358,7 @@ exports[` renders with snap and current earned less than futur
Array [
VerticalLine {
"afterDatasetsDraw": [Function],
- "income": 200,
+ "earned": 200,
"xRange": Array [
0,
90,
diff --git a/src/test/forms/output/__snapshots__/StackedBarGraph.test.js.snap b/src/test/forms/output/__snapshots__/StackedBarGraph.test.js.snap
index d98a3251..1a438272 100644
--- a/src/test/forms/output/__snapshots__/StackedBarGraph.test.js.snap
+++ b/src/test/forms/output/__snapshots__/StackedBarGraph.test.js.snap
@@ -132,7 +132,7 @@ exports[` renders with both snap and section8 1`] = `
200,
],
"fill": "origin",
- "label": "Income",
+ "label": "Earned",
},
Object {
"backgroundColor": "rgba(206, 203, 61, 1)",
@@ -164,7 +164,7 @@ exports[` renders with both snap and section8 1`] = `
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Pay ($)",
},
"stacked": true,
"ticks": Object {
@@ -188,7 +188,7 @@ exports[` renders with both snap and section8 1`] = `
},
"title": Object {
"display": true,
- "text": "Money Coming In as Income Changes",
+ "text": "Money Coming In as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -210,7 +210,7 @@ exports[` renders with both snap and section8 1`] = `
200,
],
"fill": "origin",
- "label": "Income",
+ "label": "Earned",
},
Object {
"backgroundColor": "rgba(206, 203, 61, 1)",
@@ -242,7 +242,7 @@ exports[` renders with both snap and section8 1`] = `
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Pay ($)",
},
"stacked": true,
"ticks": Object {
@@ -266,7 +266,7 @@ exports[` renders with both snap and section8 1`] = `
},
"title": Object {
"display": true,
- "text": "Money Coming In as Income Changes",
+ "text": "Money Coming In as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -413,7 +413,7 @@ exports[` renders with section8 1`] = `
200,
],
"fill": "origin",
- "label": "Income",
+ "label": "Earned",
},
Object {
"backgroundColor": "rgba(206, 203, 61, 1)",
@@ -437,7 +437,7 @@ exports[` renders with section8 1`] = `
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Pay ($)",
},
"stacked": true,
"ticks": Object {
@@ -461,7 +461,7 @@ exports[` renders with section8 1`] = `
},
"title": Object {
"display": true,
- "text": "Money Coming In as Income Changes",
+ "text": "Money Coming In as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -483,7 +483,7 @@ exports[` renders with section8 1`] = `
200,
],
"fill": "origin",
- "label": "Income",
+ "label": "Earned",
},
Object {
"backgroundColor": "rgba(206, 203, 61, 1)",
@@ -507,7 +507,7 @@ exports[` renders with section8 1`] = `
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Pay ($)",
},
"stacked": true,
"ticks": Object {
@@ -531,7 +531,7 @@ exports[` renders with section8 1`] = `
},
"title": Object {
"display": true,
- "text": "Money Coming In as Income Changes",
+ "text": "Money Coming In as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -678,7 +678,7 @@ exports[` renders with snap and current earned greater than fut
100,
],
"fill": "origin",
- "label": "Income",
+ "label": "Earned",
},
Object {
"backgroundColor": "rgba(101, 47, 138, 1)",
@@ -702,7 +702,7 @@ exports[` renders with snap and current earned greater than fut
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Pay ($)",
},
"stacked": true,
"ticks": Object {
@@ -726,7 +726,7 @@ exports[` renders with snap and current earned greater than fut
},
"title": Object {
"display": true,
- "text": "Money Coming In as Income Changes",
+ "text": "Money Coming In as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -748,7 +748,7 @@ exports[` renders with snap and current earned greater than fut
100,
],
"fill": "origin",
- "label": "Income",
+ "label": "Earned",
},
Object {
"backgroundColor": "rgba(101, 47, 138, 1)",
@@ -772,7 +772,7 @@ exports[` renders with snap and current earned greater than fut
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Pay ($)",
},
"stacked": true,
"ticks": Object {
@@ -796,7 +796,7 @@ exports[` renders with snap and current earned greater than fut
},
"title": Object {
"display": true,
- "text": "Money Coming In as Income Changes",
+ "text": "Money Coming In as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -943,7 +943,7 @@ exports[` renders with snap and current earned less than future
200,
],
"fill": "origin",
- "label": "Income",
+ "label": "Earned",
},
Object {
"backgroundColor": "rgba(101, 47, 138, 1)",
@@ -967,7 +967,7 @@ exports[` renders with snap and current earned less than future
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Pay ($)",
},
"stacked": true,
"ticks": Object {
@@ -991,7 +991,7 @@ exports[` renders with snap and current earned less than future
},
"title": Object {
"display": true,
- "text": "Money Coming In as Income Changes",
+ "text": "Money Coming In as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
@@ -1013,7 +1013,7 @@ exports[` renders with snap and current earned less than future
200,
],
"fill": "origin",
- "label": "Income",
+ "label": "Earned",
},
Object {
"backgroundColor": "rgba(101, 47, 138, 1)",
@@ -1037,7 +1037,7 @@ exports[` renders with snap and current earned less than future
Object {
"scaleLabel": Object {
"display": true,
- "labelString": "Monthly Income ($)",
+ "labelString": "Monthly Pay ($)",
},
"stacked": true,
"ticks": Object {
@@ -1061,7 +1061,7 @@ exports[` renders with snap and current earned less than future
},
"title": Object {
"display": true,
- "text": "Money Coming In as Income Changes",
+ "text": "Money Coming In as Pay Changes",
},
"tooltips": Object {
"callbacks": Object {
diff --git a/src/utils/charts/PROGRAM_CHART_VALUES.js b/src/utils/charts/PROGRAM_CHART_VALUES.js
index c8ae62ac..7deb4af2 100644
--- a/src/utils/charts/PROGRAM_CHART_VALUES.js
+++ b/src/utils/charts/PROGRAM_CHART_VALUES.js
@@ -1,7 +1,7 @@
const PROGRAM_CHART_VALUES = {
- income: {
- name: 'Income',
+ earned: {
+ name: 'Earned',
color: 'rgb(136, 187, 236)',
},
snap: {