@nnc-digital/nnc-design-system 0.4.30 → 0.4.32

package/build/index.js

@@ -4358,12 +4358,25 @@ var BinCollection = function (_a) {
                     setErrorText('No addresses found for the provided postcode.');
                     return;
                 }
-                // Transform the response data into the expected format
-                var transformedAddresses = response.data.data.map(function (item) { return ({
-                    value: item.UPRN,
-                    title: "".concat(item.Address)
-                }); });
-                setAddressOptions(transformedAddresses);
+                // Separate numeric and named addresses
+                var numericAddresses = [];
+                var namedAddresses = [];
+                response.data.data.forEach(function (item) {
+                    var address = "".concat(item.Address);
+                    if (/^\d/.test(address)) { // Address starts with a number
+                        numericAddresses.push({ value: item.UPRN, title: address });
+                    }
+                    else {
+                        namedAddresses.push({ value: item.UPRN, title: address });
+                    }
+                });
+                // Sort numeric addresses by the whole number
+                numericAddresses.sort(function (a, b) { return parseInt(a.title, 10) - parseInt(b.title, 10); });
+                // Sort named addresses alphabetically
+                namedAddresses.sort(function (a, b) { return a.title.localeCompare(b.title); });
+                // Combine the sorted arrays
+                var sortedAddresses = numericAddresses.concat(namedAddresses);
+                setAddressOptions(sortedAddresses);
             })
                 .catch(function (error) {
                 setIsLoading(false);
@@ -4405,7 +4418,7 @@ var BinCollection = function (_a) {
         var selectedUPRN = e.target.value;
         if (selectedUPRN) {
             var startDate_1 = getFormattedDate();
-            var endDate_1 = getFormattedDate(28);
+            var endDate_1 = getFormattedDate(42);
             // Fetch calendar events for the selected UPRN
             axios__default["default"].get("".concat(CalendarEventsApiUrl).concat(selectedUPRN, "/").concat(startDate_1, "/").concat(endDate_1))
                 .then(function (response) {