Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

B-18322 Update Requested pickup date #11937

Merged
merged 4 commits into from
Feb 27, 2024
Merged

B-18322 Update Requested pickup date #11937

merged 4 commits into from
Feb 27, 2024

Conversation

WeatherfordAaron
Copy link
Contributor

@WeatherfordAaron WeatherfordAaron added ByteSize M&Ms Team ByteSized M&Ms MAIN labels Feb 6, 2024
@WeatherfordAaron WeatherfordAaron marked this pull request as ready for review February 6, 2024 21:38
taeJungCaci
taeJungCaci approved these changes Feb 6, 2024
View reviewed changes
Copy link
Contributor

@taeJungCaci taeJungCaci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 6, 2024 •
edited
Loading

Bundle Stats

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
281 12.58 MB → 12.58 MB (+512 B) +0.00%
Changeset
File Δ Size
src/components/Office/ImportantShipmentDates/ImportantShipmentDates.jsx 📈 +520 B (+30.61%) 1.66 kB → 2.17 kB
src/components/Office/ShipmentDetails/ShipmentDetailsMain.jsx 📈 +1.18 kB (+12.51%) 9.43 kB → 10.61 kB
View detailed bundle breakdown

Added

Asset File Size % Changed
static/js/main.20c95c2b.js 0 B → 822.57 kB (+822.57 kB) -
static/js/1597.177e9277.chunk.js 0 B → 105.7 kB (+105.7 kB) -

Removed

Asset File Size % Changed
static/js/main.6d411650.js 822.57 kB → 0 B (-822.57 kB) -100%
static/js/1597.d0303290.chunk.js 105.2 kB → 0 B (-105.2 kB) -100%

Bigger

No assets were bigger

Smaller

No assets were smaller

Unchanged

Asset File Size % Changed
static/js/2254.7c6740de.chunk.js 1.43 MB 0%
static/css/8513.b424915e.chunk.css 1.33 MB 0%
static/js/6521.8c20f8e7.chunk.js 894.82 kB 0%
static/media/hero.bf01157b9686e90e34dd.png 609.24 kB 0%
static/css/837.8d198ac7.chunk.css 528.93 kB 0%
static/css/3026.0753412e.chunk.css 480.62 kB 0%
static/css/1170.ab8bd0a9.chunk.css 480.25 kB 0%
static/css/8946.e093a5c2.chunk.css 447.22 kB 0%
static/js/9222.8831e125.chunk.js 314.99 kB 0%
static/js/837.b882a049.chunk.js 224.82 kB 0%
static/js/2766.c67ba06a.chunk.js 154.22 kB 0%
static/js/5058.3685e0f8.chunk.js 147.79 kB 0%
static/media/PublicSans-Regular.af5c059f36e21e13f39f.ttf 78.03 kB 0%
static/media/PublicSans-Light.839012ec5b7d44a46954.ttf 77.91 kB 0%
static/media/PublicSans-Italic.642113a6a2f365350349.ttf 77.7 kB 0%
static/media/PublicSans-Bold.a52885b904d32280b208.ttf 77.61 kB 0%
static/media/PublicSans-LightItalic.49a5ea322c6c3762b921.ttf 77.44 kB 0%
static/media/PublicSans-BoldItalic.cbc51dd94deab4465d42.ttf 77.41 kB 0%
static/js/7389.34914a97.chunk.js 72.96 kB 0%
static/media/transcom-emblem.bcb580b55633c358c82d89f4798081c5.svg 65.22 kB 0%
static/js/1358.0df9f6c1.chunk.js 63.15 kB 0%
static/js/8091.6f9ad0b0.chunk.js 63.11 kB 0%
static/js/2426.a6b4f437.chunk.js 59.09 kB 0%
static/js/7673.5a439682.chunk.js 56.91 kB 0%
static/media/sourcesanspro-light-webfont.d6f73cf7210d3b5c2fa9.ttf 53.23 kB 0%
static/media/sourcesanspro-regular-webfont.5acfe0d0f69444765ba4.ttf 53.16 kB 0%
static/media/sourcesanspro-bold-webfont.9a76932911f04be25044.ttf 53.07 kB 0%
static/js/9025.f972ba15.chunk.js 52.76 kB 0%
static/js/1828.2a5c4776.chunk.js 51.62 kB 0%
static/js/9757.61017306.chunk.js 49.96 kB 0%
static/js/4911.6be173c8.chunk.js 49.81 kB 0%
static/media/Latin-Merriweather-Regular.43dc3080728216519bf0.ttf 48.32 kB 0%
static/media/Latin-Merriweather-Light.30dd683b4fcfe95b030b.ttf 48.01 kB 0%
static/css/1597.7516e744.chunk.css 46.93 kB 0%
static/media/Latin-Merriweather-Bold.b87366633b1019e8c63c.ttf 46.12 kB 0%
static/js/2897.36edbaa0.chunk.js 43.11 kB 0%
static/js/791.e321e9f5.chunk.js 41.52 kB 0%
static/js/2679.a693d80f.chunk.js 40.18 kB 0%
static/js/8946.0cc716b3.chunk.js 40.12 kB 0%
static/media/PublicSans-BoldItalic.6bb0cb126756efec5fa5.woff 39.72 kB 0%
static/media/PublicSans-Italic.333d9a80b7b3b003b3c5.woff 39.57 kB 0%
static/media/PublicSans-LightItalic.4c86a8eb158c949923dd.woff 39.53 kB 0%
static/media/Latin-Merriweather-BoldItalic.4d74f3bda45f5aba1abf.ttf 39.52 kB 0%
static/media/PublicSans-Light.8460a3397f2ffc7d22d0.woff 39.23 kB 0%
static/media/PublicSans-Regular.f32753567f64c1ddeec8.woff 39.17 kB 0%
static/media/PublicSans-Bold.8c3655e2b925bcad90cd.woff 39.11 kB 0%
static/media/Latin-Merriweather-Italic.b60043e65fa5cbcedb80.ttf 38.55 kB 0%
static/media/Latin-Merriweather-LightItalic.26ebdd3b8f1d039bc3dd.ttf 38.53 kB 0%
static/media/sourcesanspro-lightitalic-webfont.43ea3d39e6aa59fb6f1b.ttf 38.23 kB 0%
static/media/sourcesanspro-italic-webfont.3efee318468995ac04af.ttf 37.94 kB 0%
static/media/sourcesanspro-bolditalic-webfont.af3dd40e0ac8e2ca50ac.ttf 37.85 kB 0%
static/js/1176.29a9cb78.chunk.js 37.71 kB 0%
asset-manifest.json 37.38 kB 0%
static/js/5705.707c5a4a.chunk.js 34.99 kB 0%
static/js/5211.98bae868.chunk.js 34.58 kB 0%
static/js/2500.2c4ca049.chunk.js 33.09 kB 0%
static/js/2561.d7a09018.chunk.js 32.58 kB 0%
static/media/PublicSans-BoldItalic.effa83ee2a557ae8a57e.woff2 32.43 kB 0%
static/media/PublicSans-Italic.8be0a159b540a60fd93a.woff2 32.26 kB 0%
static/js/9973.3e6c72cf.chunk.js 32.24 kB 0%
static/media/PublicSans-LightItalic.475db532b9392ec581c5.woff2 32.14 kB 0%
static/media/PublicSans-Light.4ba4759c3e98938156d7.woff2 31.84 kB 0%
static/media/roboto-mono-v5-latin-300italic.93511dbad22ceb584f03.ttf 31.83 kB 0%
static/media/roboto-mono-v5-latin-700italic.da78bf0b1b435f40ca19.ttf 31.8 kB 0%
static/media/PublicSans-Regular.e86d2642f412b9493b14.woff2 31.79 kB 0%
static/media/PublicSans-Bold.4045385082dfc34c22d7.woff2 31.64 kB 0%
static/media/roboto-mono-v5-latin-italic.4863add4d566a55b6a97.ttf 31.58 kB 0%
static/media/roboto-mono-v5-latin-300.ce3838471d62f8364e12.ttf 31.41 kB 0%
static/media/okta_logo.56ac9bdcdffeda24c715.png 31.3 kB 0%
static/js/621.f6125290.chunk.js 30.88 kB 0%
static/media/roboto-mono-v5-latin-700.e57caf7ea634a258a9b2.ttf 30.36 kB 0%
static/media/roboto-mono-v5-latin-regular.215adb34128fcb20668b.ttf 30.32 kB 0%
static/css/3614.4503792b.chunk.css 29.22 kB 0%
static/css/9757.bc13cdfb.chunk.css 27.76 kB 0%
static/js/3614.f5a43ef6.chunk.js 27.38 kB 0%
static/media/Latin-Merriweather-Regular.add503b41601df15b97e.woff 26.87 kB 0%
static/js/2447.ff082d19.chunk.js 26.54 kB 0%
static/media/Latin-Merriweather-Light.7b2a6350fcb212efe521.woff 26.36 kB 0%
static/media/Latin-Merriweather-Bold.b6cbc321678701d773c6.woff 26.26 kB 0%
static/media/sourcesanspro-regular-webfont.c4e25ab10baa365dfc66.woff 25.53 kB 0%
static/media/sourcesanspro-bold-webfont.e7e051e1bc64fa899317.woff 25.43 kB 0%
static/media/sourcesanspro-light-webfont.70e7d719e258c9a7e68b.woff 25.35 kB 0%
static/media/Latin-Merriweather-BoldItalic.a0bcf832ed51501c237c.woff 23.89 kB 0%
static/css/8831.0e246a5e.chunk.css 23.64 kB 0%
static/media/Latin-Merriweather-Italic.80d8a9aff0d8bdeb966d.woff 23.59 kB 0%
static/media/Latin-Merriweather-LightItalic.8a239a410a47b6192e05.woff 23.25 kB 0%
static/js/6300.1f6c796b.chunk.js 22.99 kB 0%
static/js/8831.22c31edb.chunk.js 21.32 kB 0%
static/media/Latin-Merriweather-Regular.a30c1b8fcb759e9fe728.woff2 21.18 kB 0%
static/js/9083.c6cd3ec7.chunk.js 21.17 kB 0%
static/css/2561.03b37371.chunk.css 21.06 kB 0%
static/media/Latin-Merriweather-Bold.9caa42f21e4ae090b755.woff2 20.81 kB 0%
static/media/Latin-Merriweather-Light.f347d9834a5feacbcefb.woff2 20.76 kB 0%
static/media/roboto-mono-v5-latin-700italic.0a6791447401e0ebd70d.woff 20.64 kB 0%
static/css/9973.3ed53fd8.chunk.css 20.63 kB 0%
static/media/roboto-mono-v5-latin-italic.756750acefdb77704c08.woff 20.6 kB 0%
static/media/roboto-mono-v5-latin-300italic.1b8d46dae0a077f999ae.woff 20.56 kB 0%
static/css/1428.21649bb4.chunk.css 20.54 kB 0%
static/css/2065.6dcc2553.chunk.css 20.48 kB 0%
static/css/2766.ff423f95.chunk.css 20.19 kB 0%
static/css/7069.cd424ae7.chunk.css 20.12 kB 0%
static/media/sourcesanspro-regular-webfont.e7bccfa631a0017f31da.woff2 20.06 kB 0%
static/media/sourcesanspro-light-webfont.e5f1a42e1c2b97e25876.woff2 19.93 kB 0%
static/media/sourcesanspro-bold-webfont.4a1efbe82eaa84ff89ed.woff2 19.89 kB 0%
static/js/7375.edb4247e.chunk.js 19.86 kB 0%
static/media/sourcesanspro-lightitalic-webfont.455d120362f79aa219d4.woff 19.78 kB 0%
static/media/sourcesanspro-italic-webfont.0aaeabbaba3845331078.woff 19.73 kB 0%
static/media/sourcesanspro-bolditalic-webfont.73021f1aabd43f50e16a.woff 19.69 kB 0%
static/media/roboto-mono-v5-latin-300.92dd8f0ccfaebc33f817.woff 19.42 kB 0%
static/media/roboto-mono-v5-latin-regular.a3246d29b40a8b0da142.woff 19.12 kB 0%
static/media/Latin-Merriweather-BoldItalic.dc8b76b44a8a6e5fad1c.woff2 19.11 kB 0%
static/media/roboto-mono-v5-latin-700.d85b43c39f4620dfa5b4.woff 19.11 kB 0%
static/js/1428.db4476db.chunk.js 18.86 kB 0%
static/media/Latin-Merriweather-Italic.c63d4066b0f133fc519f.woff2 18.8 kB 0%
static/media/Latin-Merriweather-LightItalic.506121dad559538d44ed.woff2 18.53 kB 0%
static/js/8136.a19cd53f.chunk.js 18.44 kB 0%
static/js/5917.f242b498.chunk.js 18.23 kB 0%
static/css/5874.03d487f2.chunk.css 18.2 kB 0%
static/css/8879.03d487f2.chunk.css 18.2 kB 0%
static/js/2123.4a337387.chunk.js 17.39 kB 0%
static/js/6211.01639e95.chunk.js 17.37 kB 0%
static/js/4311.735d479c.chunk.js 17.25 kB 0%
static/js/8964.9a697280.chunk.js 17.02 kB 0%
static/media/roboto-mono-v5-latin-300italic.09cc62a8fbd32c8b2812.woff2 16.93 kB 0%
static/media/roboto-mono-v5-latin-700italic.5a8f743549cc6cef9a00.woff2 16.93 kB 0%
static/media/sad-computer.b62f031230f84d7db1b1.png 16.92 kB 0%
static/media/roboto-mono-v5-latin-italic.087069a9f454e2581ed6.woff2 16.91 kB 0%
static/js/6728.9e771dd1.chunk.js 16.49 kB 0%
static/js/9867.bb3fcd3d.chunk.js 16.37 kB 0%
static/js/236.08c45813.chunk.js 16.32 kB 0%
static/js/4300.9685be80.chunk.js 16.22 kB 0%
static/media/sourcesanspro-bolditalic-webfont.ef69f0d737406260319a.woff2 16.03 kB 0%
static/media/roboto-mono-v5-latin-300.316b1352cc4ab2054de6.woff2 16 kB 0%
static/media/sourcesanspro-italic-webfont.c6c9fd228e87eefaf1d4.woff2 15.99 kB 0%
static/media/sourcesanspro-lightitalic-webfont.9c5bf2190b2471c2f22b.woff2 15.93 kB 0%
static/js/8742.b1c86e70.chunk.js 15.85 kB 0%
static/js/3567.a17df16a.chunk.js 15.83 kB 0%
static/media/roboto-mono-v5-latin-regular.f1dc10a756c2c544588b.woff2 15.65 kB 0%
static/js/937.80ad11a8.chunk.js 15.64 kB 0%
static/js/2511.621251a2.chunk.js 15.64 kB 0%
static/css/9083.abca6c49.chunk.css 15.62 kB 0%
static/css/3382.57bd17ce.chunk.css 15.58 kB 0%
static/media/roboto-mono-v5-latin-700.936869ba46988c238748.woff2 15.58 kB 0%
static/js/5729.600e738b.chunk.js 15.55 kB 0%
static/js/3970.880f1dbd.chunk.js 15.36 kB 0%
static/css/3129.5799101c.chunk.css 14.89 kB 0%
static/css/9046.6491596d.chunk.css 14.89 kB 0%
static/js/4999.706dff7e.chunk.js 14.73 kB 0%
static/js/7516.cce7d765.chunk.js 14.38 kB 0%
static/js/8348.c8599551.chunk.js 13.55 kB 0%
static/js/3412.3c287582.chunk.js 13.35 kB 0%
static/css/3970.86664049.chunk.css 13.11 kB 0%
static/css/9867.8f3cbbe8.chunk.css 13.05 kB 0%
static/css/4999.d79ab0f6.chunk.css 13.01 kB 0%
static/js/8858.859b9f70.chunk.js 12.12 kB 0%
static/js/3382.47271ec6.chunk.js 12.08 kB 0%
static/css/6743.36446d49.chunk.css 11.89 kB 0%
static/css/1176.f3a63704.chunk.css 11.86 kB 0%
static/css/5211.f3a63704.chunk.css 11.86 kB 0%
static/css/5904.be1f5f1b.chunk.css 11.85 kB 0%
static/css/512.66a0d043.chunk.css 11.8 kB 0%
static/js/3512.d09d0f15.chunk.js 11.5 kB 0%
static/js/1719.9b21768d.chunk.js 11.09 kB 0%
static/js/3129.dc1af2d5.chunk.js 11.06 kB 0%
static/js/9103.a92e127b.chunk.js 10.89 kB 0%
static/js/5704.12d32b88.chunk.js 10.66 kB 0%
static/js/6593.e02c18d6.chunk.js 10.48 kB 0%
static/js/1822.390fb9f8.chunk.js 10.06 kB 0%
static/js/4854.59945c29.chunk.js 9.69 kB 0%
static/js/6173.0c2d2a22.chunk.js 9.6 kB 0%
static/js/9046.c9d13b63.chunk.js 9.55 kB 0%
static/js/4837.805ab774.chunk.js 9.54 kB 0%
static/js/7557.be18f481.chunk.js 9.52 kB 0%
static/js/7069.689edea1.chunk.js 9.43 kB 0%
static/js/5904.67885aac.chunk.js 9.31 kB 0%
static/js/8513.9253b217.chunk.js 9.28 kB 0%
static/js/8781.02af6dc2.chunk.js 9.22 kB 0%
static/css/7375.c2c04a36.chunk.css 9.12 kB 0%
static/css/5729.57eedea8.chunk.css 9.04 kB 0%
static/js/8424.f282e18f.chunk.js 8.9 kB 0%
static/js/9685.97f63ead.chunk.js 8.85 kB 0%
static/js/5021.178cc676.chunk.js 8.4 kB 0%
static/js/4265.2d14e93d.chunk.js 8.26 kB 0%
static/js/955.1c228269.chunk.js 7.85 kB 0%
static/css/4869.97de4a15.chunk.css 7.82 kB 0%
static/css/9703.97de4a15.chunk.css 7.82 kB 0%
static/css/1719.9bb93725.chunk.css 7.72 kB 0%
static/css/8858.efde2578.chunk.css 7.72 kB 0%
static/js/512.d5f97951.chunk.js 7.66 kB 0%
static/js/5822.d16db697.chunk.js 7.59 kB 0%
static/js/6743.658b3acd.chunk.js 7.56 kB 0%
static/css/8781.6aa8a70d.chunk.css 7.44 kB 0%
static/css/7673.3d72b117.chunk.css 7.38 kB 0%
static/js/968.55c3e8a8.chunk.js 7.35 kB 0%
static/css/937.8560ba73.chunk.css 7.21 kB 0%
static/css/6211.5d821cb4.chunk.css 7.02 kB 0%
static/css/4311.c24cd062.chunk.css 6.98 kB 0%
static/css/5021.ab631bd7.chunk.css 6.58 kB 0%
static/css/8646.6489c628.chunk.css 6.58 kB 0%
static/css/9398.6489c628.chunk.css 6.58 kB 0%
static/js/807.340497e2.chunk.js 6.43 kB 0%
static/js/8560.730ff560.chunk.js 5.88 kB 0%
static/js/3338.1b330462.chunk.js 5.83 kB 0%
static/media/milmove-logo.c977261e059ba42b2b70ba95cfb3d3de.svg 5.4 kB 0%
static/css/4300.4449b9b1.chunk.css 5.21 kB 0%
static/js/3570.043aaf2c.chunk.js 5.07 kB 0%
static/js/9398.1b3c4b6f.chunk.js 4.72 kB 0%
static/css/3338.3554f4da.chunk.css 4.56 kB 0%
static/css/9103.3554f4da.chunk.css 4.56 kB 0%
static/js/8646.107598e5.chunk.js 4.13 kB 0%
static/css/8136.622b1d0d.chunk.css 3.89 kB 0%
static/css/2123.4547404f.chunk.css 3.84 kB 0%
static/js/6363.e2a98a76.chunk.js 3.77 kB 0%
static/js/7796.c183e6fc.chunk.js 3.77 kB 0%
static/css/2511.20518425.chunk.css 3.27 kB 0%
static/js/8600.c2b13306.chunk.js 2.9 kB 0%
static/js/8522.1791aca5.chunk.js 2.83 kB 0%
static/js/935.08948b94.chunk.js 2.83 kB 0%
static/css/4265.f7a86514.chunk.css 2.81 kB 0%
static/css/3512.2b2a1a2e.chunk.css 2.78 kB 0%
static/js/4063.d12fee47.chunk.js 2.74 kB 0%
static/css/5704.12e62308.chunk.css 2.51 kB 0%
static/js/5874.c553947f.chunk.js 2.42 kB 0%
static/js/8879.b05a591b.chunk.js 2.26 kB 0%
static/css/1487.3f0e4b3d.chunk.css 2.04 kB 0%
static/css/1862.3f0e4b3d.chunk.css 2.04 kB 0%
static/css/6261.4b4b13d4.chunk.css 2.04 kB 0%
static/css/4837.b0f5891d.chunk.css 2.01 kB 0%
static/css/8522.289b0009.chunk.css 1.96 kB 0%
static/js/2065.868b31f6.chunk.js 1.96 kB 0%
static/js/1487.bfddbaad.chunk.js 1.79 kB 0%
static/js/1862.2ceac478.chunk.js 1.79 kB 0%
static/js/6261.0a77bdb3.chunk.js 1.78 kB 0%
static/media/loader.10d2d7c0a681e4e825da.svg 1.67 kB 0%
static/css/791.bc8960d3.chunk.css 1.64 kB 0%
static/css/main.5749796c.css 1.27 kB 0%
static/media/accept-inversed.91ff05235fdd54954706eab64123a3d5.svg 1.14 kB 0%
static/css/6363.cc7fc70c.chunk.css 1.03 kB 0%
static/css/4063.a75d8732.chunk.css 960 B 0%
static/media/file-pdf.51bdb15e1e5b831bcf29.svg 904 B 0%
static/js/8762.5367cbde.chunk.js 885 B 0%
static/css/3570.ecd0ee5d.chunk.css 852 B 0%
static/media/file-word.277ffb94e7a09f8a2d1a.svg 760 B 0%
static/media/file-excel.d002b7e57fe318badf49.svg 658 B 0%
static/media/correct8-alt.30d16a7a68f9063d3141.svg 607 B 0%
static/css/8560.c4ca767b.chunk.css 601 B 0%
static/media/correct8.eac85396da602db01ea3.svg 600 B 0%
index.html 595 B 0%
static/media/twitter.a8c1622d4e18b18caa167dbe0e31135b.svg 588 B 0%
static/media/file-video.15490fa6d64ebfb4f314.svg 574 B 0%
static/js/9703.01be8f0b.chunk.js 568 B 0%
static/css/1822.83c6aaf2.chunk.css 531 B 0%
static/css/8762.84987cf8.chunk.css 462 B 0%
static/media/navigate_far_before.8c7765f1f2719ccdf3e5.svg 403 B 0%
static/media/navigate_far_next.602e9c473cc76474ac50.svg 402 B 0%
static/media/search.bc2178ae2f929aec5f09.svg 372 B 0%
static/media/facebook.9d8980817d35c2617cf1ebb5a833369a.svg 346 B 0%
static/media/file.7e80f971a49227f49f7e.svg 283 B 0%
static/media/launch--white.4e75d17dfe08a3d7de03.svg 283 B 0%
static/media/launch.65e057b210ca1e5d086e.svg 268 B 0%
static/media/unfold_more.c42abd3e70207a863184.svg 257 B 0%
static/media/check_circle.afe00fa2d228d8e9212e.svg 255 B 0%
static/media/calendar_today.26e6a18c4fb766a6307e.svg 248 B 0%
static/media/error--white.7f8e755b649a0ca72ce5.svg 246 B 0%
static/media/close.53c9f4b6ba9fca553d1e.svg 239 B 0%
static/media/error.57f310a26aa85a42d2a6.svg 234 B 0%
static/media/info.b15cdce316c440127b62.svg 234 B 0%
static/css/955.c056130c.chunk.css 226 B 0%
static/media/check--blue-60v.c60440495de32668463f.svg 202 B 0%
static/media/arrow_back.037e7aeb3dbe35a36ea6.svg 198 B 0%
static/media/warning.9fcdc101f630d1fd1e97.svg 188 B 0%
static/media/expand_less.018f82c5d61abf0ebfce.svg 184 B 0%
static/media/navigate_before.f280e5b722fcf18e18a9.svg 184 B 0%
static/media/navigate_next.00940e89d53796e4fc95.svg 184 B 0%
static/media/expand_more.7bdcd63935a4c23e5b72.svg 182 B 0%
static/media/add.0ddb797a0b4996c9f281.svg 173 B 0%
static/media/remove.fb2b121df150d251453a.svg 155 B 0%
static/css/5822.64281aca.chunk.css 133 B 0%
static/css/8600.6317b9ee.chunk.css 133 B 0%

KonstanceH
KonstanceH approved these changes Feb 7, 2024
View reviewed changes
Copy link
Contributor

@KonstanceH KonstanceH left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@WeatherfordAaron WeatherfordAaron requested a review from a team as a code owner February 8, 2024 21:15
@JamesHawks224
Copy link
Contributor

Testing status:

branch checkout failed.
below is 2 items: checkout text and git status

checkout text:
Switched to branch 'amw-kickback-B18326-B18327-Update-the-Estimated-Weight-PPM-Remove-select-fields-from-MTO'
Your branch and 'origin/amw-kickback-B18326-B18327-Update-the-Estimated-Weight-PPM-Remove-select-fields-from-MTO' have diverged,
and have 483 and 108 different commits each, respectively.
(use "git pull" if you want to integrate the remote branch with yours)
Auto-merging .circleci/config.yml
Auto-merging migrations/app/migrations_manifest.txt
Auto-merging migrations/app/secure/20240124155759_20240124-homesafeconnect-cert.up.sql
CONFLICT (content): Merge conflict in migrations/app/secure/20240124155759_20240124-homesafeconnect-cert.up.sql
warning: Cannot merge binary files: pkg/gen/ghcapi/embedded_spec.go (HEAD vs. e653815)
Auto-merging pkg/gen/ghcapi/embedded_spec.go
CONFLICT (content): Merge conflict in pkg/gen/ghcapi/embedded_spec.go
warning: Cannot merge binary files: pkg/gen/internalapi/configure_mymove.go (HEAD vs. e653815)
Auto-merging pkg/gen/internalapi/configure_mymove.go
CONFLICT (content): Merge conflict in pkg/gen/internalapi/configure_mymove.go
warning: Cannot merge binary files: pkg/gen/internalapi/embedded_spec.go (HEAD vs. e653815)
Auto-merging pkg/gen/internalapi/embedded_spec.go
CONFLICT (content): Merge conflict in pkg/gen/internalapi/embedded_spec.go
warning: Cannot merge binary files: pkg/gen/internalapi/internaloperations/mymove_api.go (HEAD vs. e653815)
Auto-merging pkg/gen/internalapi/internaloperations/mymove_api.go
CONFLICT (content): Merge conflict in pkg/gen/internalapi/internaloperations/mymove_api.go
warning: Cannot merge binary files: pkg/gen/primeapi/embedded_spec.go (HEAD vs. e653815)
Auto-merging pkg/gen/primeapi/embedded_spec.go
CONFLICT (content): Merge conflict in pkg/gen/primeapi/embedded_spec.go
Auto-merging pkg/handlers/ghcapi/internal/payloads/model_to_payload.go
Auto-merging pkg/handlers/internalapi/api.go
CONFLICT (content): Merge conflict in pkg/handlers/internalapi/api.go
Auto-merging pkg/services/shipment_address_update/shipment_address_update_requester_test.go
CONFLICT (content): Merge conflict in pkg/services/shipment_address_update/shipment_address_update_requester_test.go
Auto-merging playwright/tests/my/mymove/onboarding.spec.js
CONFLICT (content): Merge conflict in playwright/tests/my/mymove/onboarding.spec.js
Auto-merging playwright/tests/my/mymove/orders.spec.js
CONFLICT (content): Merge conflict in playwright/tests/my/mymove/orders.spec.js
Auto-merging src/components/Office/ImportantShipmentDates/ImportantShipmentDates.jsx
CONFLICT (content): Merge conflict in src/components/Office/ImportantShipmentDates/ImportantShipmentDates.jsx
Auto-merging src/components/Office/ShipmentContainer/ShipmentContainer.jsx
CONFLICT (content): Merge conflict in src/components/Office/ShipmentContainer/ShipmentContainer.jsx
Auto-merging src/components/Office/ShipmentDetails/ShipmentDetailsMain.jsx
CONFLICT (content): Merge conflict in src/components/Office/ShipmentDetails/ShipmentDetailsMain.jsx
Auto-merging src/constants/routes.js
Auto-merging src/pages/MyMove/EditOrders.jsx
CONFLICT (content): Merge conflict in src/pages/MyMove/EditOrders.jsx
Auto-merging src/pages/MyMove/Multi-Moves/MultiMovesLandingPage.jsx
CONFLICT (add/add): Merge conflict in src/pages/MyMove/Multi-Moves/MultiMovesLandingPage.jsx
Auto-merging src/pages/MyMove/Multi-Moves/MultiMovesLandingPage.test.jsx
CONFLICT (add/add): Merge conflict in src/pages/MyMove/Multi-Moves/MultiMovesLandingPage.test.jsx
Auto-merging src/pages/MyMove/Multi-Moves/MultiMovesMoveContainer/MultiMovesMoveContainer.jsx
CONFLICT (add/add): Merge conflict in src/pages/MyMove/Multi-Moves/MultiMovesMoveContainer/MultiMovesMoveContainer.jsx
Auto-merging src/pages/MyMove/Multi-Moves/MultiMovesMoveContainer/MultiMovesMoveContainer.test.jsx
CONFLICT (add/add): Merge conflict in src/pages/MyMove/Multi-Moves/MultiMovesMoveContainer/MultiMovesMoveContainer.test.jsx
Auto-merging src/pages/MyMove/Multi-Moves/MultiMovesMoveInfoList/MultiMovesInfoList.test.jsx
CONFLICT (add/add): Merge conflict in src/pages/MyMove/Multi-Moves/MultiMovesMoveInfoList/MultiMovesInfoList.test.jsx
Auto-merging src/scenes/MyMove/index.jsx
Auto-merging src/shared/constants.js
CONFLICT (content): Merge conflict in src/shared/constants.js
Auto-merging swagger-def/internal.yaml
CONFLICT (content): Merge conflict in swagger-def/internal.yaml
Auto-merging swagger-def/prime.yaml
warning: Cannot merge binary files: swagger/ghc.yaml (HEAD vs. e653815)
Auto-merging swagger/ghc.yaml
CONFLICT (content): Merge conflict in swagger/ghc.yaml
warning: Cannot merge binary files: swagger/internal.yaml (HEAD vs. e653815)
Auto-merging swagger/internal.yaml
CONFLICT (content): Merge conflict in swagger/internal.yaml
warning: Cannot merge binary files: swagger/prime.yaml (HEAD vs. e653815)
Auto-merging swagger/prime.yaml
CONFLICT (content): Merge conflict in swagger/prime.yaml
Automatic merge failed; fix conflicts and then commit the result.
ERROR... git pull failed. branch=[amw-kickback-B18326-B18327-Update-the-Estimated-Weight-PPM-Remove-select-fields-from-MTO] rc=[1]

git status:
$ git status
On branch amw-kickback-B18326-B18327-Update-the-Estimated-Weight-PPM-Remove-select-fields-from-MTO
Your branch and 'origin/amw-kickback-B18326-B18327-Update-the-Estimated-Weight-PPM-Remove-select-fields-from-MTO' have diverged,
and have 483 and 108 different commits each, respectively.
(use "git pull" if you want to integrate the remote branch with yours)

You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)

Changes to be committed:
modified: .circleci/config.yml
modified: .github/CODEOWNERS
modified: .github/workflows/auto-approve.yml
modified: .github/workflows/go-auto-approve.yml
modified: Dockerfile.e2e
modified: Dockerfile.migrations
modified: Dockerfile.migrations_local
modified: Dockerfile.reviewapp
modified: Dockerfile.tools
modified: Dockerfile.tools_local
renamed: config/tls/Certificates_PKCS7_v5.12_DoD.der.p7b -> config/tls/Certificates_PKCS7_v5.13_DoD.der.p7b
deleted: config/tls/ECA_Root_CA_4.cer
deleted: config/tls/IdenTrust-ECA-S23.cer
modified: config/tls/milmove-cert-bundle.p7b
deleted: config/tls/mmb.gov.uat.homesafeconnect.com.cer
modified: go.mod
modified: go.sum
modified: migrations/app/migrations_manifest.txt
new file: migrations/app/schema/20240206173201_update_shipment_address_update_table_sit_and_distance_columns.up.sql
new file: migrations/app/secure/20240129153006_20240129-homesafeconnect-cert.up.sql
new file: migrations/app/secure/20240201174442_20240201_homesafe_prd_cert.up.sql
modified: pkg/gen/primeapi/primeoperations/sit_address_update/create_s_i_t_address_update_request.go
modified: pkg/gen/primeclient/sit_address_update/sit_address_update_client.go
modified: src/constants/routes.js
modified: src/scenes/MyMove/index.jsx
modified: swagger-def/prime.yaml

Unmerged paths:
(use "git add ..." to mark resolution)
both modified: migrations/app/secure/20240124155759_20240124-homesafeconnect-cert.up.sql
both modified: pkg/gen/ghcapi/embedded_spec.go
both modified: pkg/gen/internalapi/configure_mymove.go
both modified: pkg/gen/internalapi/embedded_spec.go
both modified: pkg/gen/internalapi/internaloperations/mymove_api.go
both modified: pkg/gen/primeapi/embedded_spec.go
both modified: pkg/handlers/internalapi/api.go
both modified: pkg/services/shipment_address_update/shipment_address_update_requester_test.go
both modified: playwright/tests/my/mymove/onboarding.spec.js
both modified: playwright/tests/my/mymove/orders.spec.js
both modified: src/components/Office/ImportantShipmentDates/ImportantShipmentDates.jsx
both modified: src/components/Office/ShipmentContainer/ShipmentContainer.jsx
both modified: src/components/Office/ShipmentDetails/ShipmentDetailsMain.jsx
both modified: src/pages/MyMove/EditOrders.jsx
both added: src/pages/MyMove/Multi-Moves/MultiMovesLandingPage.jsx
both added: src/pages/MyMove/Multi-Moves/MultiMovesLandingPage.test.jsx
both added: src/pages/MyMove/Multi-Moves/MultiMovesMoveContainer/MultiMovesMoveContainer.jsx
both added: src/pages/MyMove/Multi-Moves/MultiMovesMoveContainer/MultiMovesMoveContainer.test.jsx
both added: src/pages/MyMove/Multi-Moves/MultiMovesMoveInfoList/MultiMovesInfoList.test.jsx
both modified: src/shared/constants.js
both modified: swagger-def/internal.yaml
both modified: swagger/ghc.yaml
both modified: swagger/internal.yaml
both modified: swagger/prime.yaml

@JamesHawks224
Copy link
Contributor

Verification rpt attached.
There were differences.

B18322.verify_rpt.txt

@JamesHawks224
Copy link
Contributor

Per dev, main pr is correct and complete.

@WeatherfordAaron WeatherfordAaron force-pushed the amw-kickback-B18326-B18327-Update-the-Estimated-Weight-PPM-Remove-select-fields-from-MTO branch from 5b87591 to 257f72b Compare February 27, 2024 17:19
JamesHawks224
JamesHawks224 approved these changes Feb 27, 2024
View reviewed changes
Copy link
Contributor

@JamesHawks224 JamesHawks224 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@JamesHawks224 JamesHawks224 merged commit 0a692d3 into main Feb 27, 2024
39 checks passed
@JamesHawks224 JamesHawks224 deleted the amw-kickback-B18326-B18327-Update-the-Estimated-Weight-PPM-Remove-select-fields-from-MTO branch February 27, 2024 19:36
@WeatherfordAaron WeatherfordAaron restored the amw-kickback-B18326-B18327-Update-the-Estimated-Weight-PPM-Remove-select-fields-from-MTO branch February 27, 2024 20:14
@WeatherfordAaron WeatherfordAaron deleted the amw-kickback-B18326-B18327-Update-the-Estimated-Weight-PPM-Remove-select-fields-from-MTO branch January 9, 2025 21:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@taeJungCaci taeJungCaci taeJungCaci approved these changes

@JamesHawks224 JamesHawks224 JamesHawks224 approved these changes

@KonstanceH KonstanceH KonstanceH approved these changes

@deandreJones deandreJones Awaiting requested review from deandreJones

@cameroncaci cameroncaci Awaiting requested review from cameroncaci

@josiahzimmerman-caci josiahzimmerman-caci Awaiting requested review from josiahzimmerman-caci

Assignees

@JamesHawks224 JamesHawks224

Labels
ByteSize M&Ms Team ByteSized M&Ms MAIN
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@WeatherfordAaron @JamesHawks224 @taeJungCaci @KonstanceH