From 23d1d9b11d9a850189ce262ab17c278592109cbe Mon Sep 17 00:00:00 2001 From: Alex Soloviev Date: Wed, 27 Dec 2023 13:07:28 -0500 Subject: [PATCH] Merge develop -> main for new release ver 1.3.6 (#990) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * collaps result summary in mobile * title language fix * changed date to 1900 to match error message * Checking in tests * force white background on select * check benefit exists * just to check deployment * update title * final test fixes. * update * change reference to ALWS * change year to 1899 * initial commit * Update build-and-push-dev.yml * Update build-and-push-prod.yml * Update build-and-push-dev.yml * Update build-and-push-prod.yml * fixing trigger and cleanup * fix:updated rates for Q1 2024 * updated links and border color on focus * fix:updated rates for Q1 2024 * fix: removed excess packages * Adding pipeline secrets * Use fieldDefinition instead of categoryMapping * Adding values for variables, removing unused secrets * ADO 134595: Refactor benefitHandler (#960) * Undoing previous commit, cleaning up the variable names * Using a new service principal * July 2013 OAS deferral (#945) Co-authored-by: VeroBr0~ Co-authored-by: Veronique B <131703940+VeroBr0@users.noreply.github.com> * updated link anchor for footer * update width * update * Adding the NEXT_AUTH_SECRET variable * Adding the EXPOSE instruction for the proper port of this app * Revert "Q124 rate update" * removing an underscore (#971) * Pipeline underscore (#972) * removing an underscore * testing new home var * Pipeline underscore2 (#974) testing new home var * Fix 143948 * fix for failing tests * Pipeline updates (#977) * Updating pipelines * Updating pipelines * Pipeline underscore (#973) * removing an underscore * testing new home var * testing new home var * clarify comment * Pipeline updates (#978) * Updating pipelines * Updating pipelines * Fixing a docker tag problem --------- Co-authored-by: Jeremy Kennedy Co-authored-by: Marco <52539578+MarcoGoC@users.noreply.github.com> * added condition for partner legal status * updated dev yml * hotfix typo * fix:ran scraper * fix:ran scraper * Remove leading space in message, fix for 40 years not displaying * added params to current result benefit handler * super hotfix * Merge main (#989) * Updating pipelines * Fixing pipeline files * merge main --------- Co-authored-by: shawn320 Co-authored-by: MarcoGoC Co-authored-by: Maxim Lam Co-authored-by: Marco <52539578+MarcoGoC@users.noreply.github.com> Co-authored-by: Adam Co-authored-by: Maxim Lam <109530511+Maxim-Lam@users.noreply.github.com> Co-authored-by: Adam Andrews <35509135+andr0272@users.noreply.github.com> Co-authored-by: “Patrick“ Co-authored-by: VeroBr0~ Co-authored-by: Veronique B <131703940+VeroBr0@users.noreply.github.com> Co-authored-by: Jeremy Kennedy --- utils/api/scrapers/data/oas-amounts-en.json | 46 +++++++++---------- .../api/scrapers/output/legalValuesJson.json | 46 +++++++++---------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/utils/api/scrapers/data/oas-amounts-en.json b/utils/api/scrapers/data/oas-amounts-en.json index d2fd7fdcc..4b1422b65 100644 --- a/utils/api/scrapers/data/oas-amounts-en.json +++ b/utils/api/scrapers/data/oas-amounts-en.json @@ -1,39 +1,39 @@ { "lastupdatedYear": "2022", - "lastupdatedQuarter": "October to December 2023", + "lastupdatedQuarter": "January to March 2024", "renewalYearGIS": "2023", "oas": { - "average": "707.68", - "average75": "778.45", + "average": "713.34", + "average75": "784.67", "maximum": "142,609", "maximum75": "148,179", - "clawback": "86,912" + "clawback": "81,761" }, "gis": { - "single-amount": "1,057.01", - "single-limit": "21,456", - "spouse-oas-amount": "636.26", - "spouse-oas-limit": "28,320", - "spouse-no-oas-amount": "1,057.01", - "spouse-no-oas-limit": "51,408", - "spouse-allowance-amount": "636.26", - "spouse-allowance-limit": "39,648" + "single-amount": "1,065.47", + "single-limit": "21,624", + "spouse-oas-amount": "641.35", + "spouse-oas-limit": "28,560", + "spouse-no-oas-amount": "1,065.47", + "spouse-no-oas-limit": "51,840", + "spouse-allowance-amount": "641.35", + "spouse-allowance-limit": "39,984" }, "allowance": { - "spouse-gis-amount": "1,343.94", - "spouse-gis-limit": "39,648", - "survivor-amount": "1,602.07", - "survivor-limit": "28,872" + "spouse-gis-amount": "1,354.69", + "spouse-gis-limit": "39,984", + "survivor-amount": "1,614.89", + "survivor-limit": "29,112" }, "topup": { - "single": "163.73", - "married": "46.39" + "single": "165.04", + "married": "46.76" }, "delay": { - "oas66": "758.63", - "oas67": "809.59", - "oas68": "860.54", - "oas69": "911.49", - "oas70": "962.44" + "oas66": "764.70", + "oas67": "816.06", + "oas68": "867.42", + "oas69": "918.78", + "oas70": "970.14" } } diff --git a/utils/api/scrapers/output/legalValuesJson.json b/utils/api/scrapers/output/legalValuesJson.json index efb3e8bce..50b75346a 100644 --- a/utils/api/scrapers/output/legalValuesJson.json +++ b/utils/api/scrapers/output/legalValuesJson.json @@ -1,39 +1,39 @@ { "lastUpdatedYear": 2022, - "lastUpdatedQuarter": "October to December 2023", + "lastUpdatedQuarter": "January to March 2024", "renewalYearGIS": 2023, "oas": { - "amount": 707.68, - "amount75": 778.45, + "amount": 713.34, + "amount75": 784.67, "incomeLimit": 142609, "incomeLimit75": 148179, - "clawbackIncomeLimit": 86912 + "clawbackIncomeLimit": 81761 }, "gis": { - "singleAmount": 1057.01, - "singleIncomeLimit": 21456, - "spouseOasAmount": 636.26, - "spouseOasIncomeLimit": 28320, - "spouseNoOasAmount": 1057.01, - "spouseNoOasIncomeLimit": 51408, - "spouseAlwAmount": 636.26, - "spouseAlwIncomeLimit": 39648 + "singleAmount": 1065.47, + "singleIncomeLimit": 21624, + "spouseOasAmount": 641.35, + "spouseOasIncomeLimit": 28560, + "spouseNoOasAmount": 1065.47, + "spouseNoOasIncomeLimit": 51840, + "spouseAlwAmount": 641.35, + "spouseAlwIncomeLimit": 39984 }, "alw": { - "alwAmount": 1343.94, - "alwIncomeLimit": 39648, - "afsAmount": 1602.07, - "afsIncomeLimit": 28872 + "alwAmount": 1354.69, + "alwIncomeLimit": 39984, + "afsAmount": 1614.89, + "afsIncomeLimit": 29112 }, "topUp": { - "single": 163.73, - "married": 46.39 + "single": 165.04, + "married": 46.76 }, "delay": { - "oas66": 758.63, - "oas67": 809.59, - "oas68": 860.54, - "oas69": 911.49, - "oas70": 962.44 + "oas66": 764.7, + "oas67": 816.06, + "oas68": 867.42, + "oas69": 918.78, + "oas70": 970.14 } }