commit_hash
stringlengths
40
40
input
stringlengths
13
7.99k
output
stringlengths
5
155
full_message
stringlengths
6
8.96k
162be21fe668c9e649ba4fb9bf9af77c500efe65
--- package-lock.json @@ -57,7 +57,7 @@ "@walmart/iteminfo-mini-app": "7.0.8", "@walmart/manager-approvals-miniapp": "0.2.1", "@walmart/me-field-mini-app": "1.1.45", - "@walmart/metrics-mini-app": "0.9.48", + "@walmart/metrics-mini-app": "0.9.56", "@walmart/mod-flex-mini-app": "1.5.5", "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.14", @@ -5505,9 +5505,9 @@ } }, "node_modules/@walmart/metrics-mini-app": { - "version": "0.9.48", - "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.9.48.tgz", - "integrity": "sha512-DsUYqrCL1W8ZcLdSsNp+p3oQBr45xS737+m/9RlA+3stfbrBRSf4orv1dx8xSgiaWXbdTI24l8zVF3ojaBFohg==", + "version": "0.9.56", + "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.9.56.tgz", + "integrity": "sha512-EcTTC+lwzQld8R8hVwS2nx57fLP0fi4DjraxaP7M3YoSKpnjZIB+Wl3GoN1r48bW19oV+xBWRz/M90l2dGhMGQ==", "dependencies": { "@types/base-64": "^1.0.0", "apisauce": "1.1.2", @@ -25158,9 +25158,9 @@ "version": "1.1.45" }, "@walmart/metrics-mini-app": { - "version": "0.9.48", - "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.9.48.tgz", - "integrity": "sha512-DsUYqrCL1W8ZcLdSsNp+p3oQBr45xS737+m/9RlA+3stfbrBRSf4orv1dx8xSgiaWXbdTI24l8zVF3ojaBFohg==", + "version": "0.9.56", + "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.9.56.tgz", + "integrity": "sha512-EcTTC+lwzQld8R8hVwS2nx57fLP0fi4DjraxaP7M3YoSKpnjZIB+Wl3GoN1r48bW19oV+xBWRz/M90l2dGhMGQ==", "requires": { "@types/base-64": "^1.0.0", "apisauce": "1.1.2", --- package.json @@ -99,7 +99,7 @@ "@walmart/iteminfo-mini-app": "7.0.8", "@walmart/manager-approvals-miniapp": "0.2.1", "@walmart/me-field-mini-app": "1.1.45", - "@walmart/metrics-mini-app": "0.9.48", + "@walmart/metrics-mini-app": "0.9.56", "@walmart/mod-flex-mini-app": "1.5.5", "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.14",
Bumping version after resolving bugs
Bumping version after resolving bugs
329b9c3996854e0471ed15a636676d4cae4acdd6
--- package-lock.json @@ -40,7 +40,7 @@ "@walmart/amp-mini-app": "1.1.48", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.13.4", - "@walmart/attendance-mini-app": "0.190.5", + "@walmart/attendance-mini-app": "0.190.6", "@walmart/compass-sdk-rn": "4.2.0", "@walmart/config-components": "4.2.1", "@walmart/copilot-mini-app": "1.77.9", @@ -6938,9 +6938,9 @@ } }, "node_modules/@walmart/attendance-mini-app": { - "version": "0.190.5", - "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-0.190.5.tgz", - "integrity": "sha512-F2B4OavhwScB1VdN82fnj19EchVOprJXZ8rADTTfmwZTmWayylqg6Pk4gZobq40oyZ9rd32m6Bg3NafhsCx09A==", + "version": "0.190.6", + "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-0.190.6.tgz", + "integrity": "sha512-sQ9IXeWLuNkR5FplypvAPWp/8NHitlTCR0hngOdExJztV31tFzXRw2wRDH+HYJTc8zDVHfGYTBTBtlY/O0cjZg==", "dependencies": { "@walmart/gta-react-native-calendars": "^0.0.16", "@walmart/wfm-ui": "^0.2.26", @@ -30376,9 +30376,9 @@ } }, "@walmart/attendance-mini-app": { - "version": "0.190.5", - "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-0.190.5.tgz", - "integrity": "sha512-F2B4OavhwScB1VdN82fnj19EchVOprJXZ8rADTTfmwZTmWayylqg6Pk4gZobq40oyZ9rd32m6Bg3NafhsCx09A==", + "version": "0.190.6", + "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-0.190.6.tgz", + "integrity": "sha512-sQ9IXeWLuNkR5FplypvAPWp/8NHitlTCR0hngOdExJztV31tFzXRw2wRDH+HYJTc8zDVHfGYTBTBtlY/O0cjZg==", "requires": { "@walmart/gta-react-native-calendars": "^0.0.16", "@walmart/wfm-ui": "^0.2.26", --- package.json @@ -81,7 +81,7 @@ "@walmart/amp-mini-app": "1.1.48", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.13.4", - "@walmart/attendance-mini-app": "0.190.5", + "@walmart/attendance-mini-app": "0.190.6", "@walmart/compass-sdk-rn": "4.2.0", "@walmart/config-components": "4.2.1", "@walmart/copilot-mini-app": "1.77.9",
ama v0.190.6 patch fix for tor data load issue
ama v0.190.6 patch fix for tor data load issue
b144cb034940726523cf98c562a604301a6568b6
--- package-lock.json @@ -3575,9 +3575,9 @@ } }, "@walmart/ui-components": { - "version": "1.1.51", - "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.1.51.tgz", - "integrity": "sha512-FYfpV677fCXXjg92mavV8+AdIvFIuLBFpRyiU/GgrP2+atU36HFumE5xSjkvLMt/n9Ko28j/+DzmHSKmPrEtaQ==", + "version": "1.1.53", + "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.1.53.tgz", + "integrity": "sha512-8vuVF6ZGGRilaQHe5xb2JL+AFZpa12ht7O/EMeZS98W3ckD7KT5nXfzM4m3UhAF3YR6+ozcxPkrajjOombyzdA==", "requires": { "react-native-calendars": "1.299.0" } @@ -7016,9 +7016,9 @@ "integrity": "sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA==" }, "immutable": { - "version": "4.0.0-rc.12", - "resolved": "https://npme.walmart.com/immutable/-/immutable-4.0.0-rc.12.tgz", - "integrity": "sha512-0M2XxkZLx/mi3t8NVwIm1g8nHoEmM9p9UBl/G9k4+hm0kBgOVdMV/B3CY5dQ8qG8qc80NN4gDV4HQv6FTJ5q7A==" + "version": "4.0.0-rc.15", + "resolved": "https://npme.walmart.com/immutable/-/immutable-4.0.0-rc.15.tgz", + "integrity": "sha512-v8+A3sNyaieoP9dHegl3tEYnIZa7vqNiSv0U6D7YddiZi34VjKy4GsIxrRHj2d8+CS3MeiVja5QyNe4JO/aEXA==" }, "import-fresh": { "version": "2.0.0", --- package.json @@ -89,7 +89,7 @@ "@walmart/schedule-mini-app": "0.2.76", "@walmart/settings-mini-app": "1.3.4", "@walmart/time-clock-mini-app": "0.3.10", - "@walmart/ui-components": "1.1.51", + "@walmart/ui-components": "1.1.53", "@walmart/welcomeme-mini-app": "0.26.2", "@walmart/wfm-ui": "^0.1.50", "axios-cache-adapter": "2.7.3",
Updating ui components for global nav fix
Updating ui components for global nav fix
8db606971a8fb840cd9e1e0d23a058db395170cb
--- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.0.2", + "version": "1.0.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/myteam-mini-app", - "version": "1.0.2", + "version": "1.0.3", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.20.0", --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.0.2", + "version": "1.0.3", "private": false, "main": "dist/index.js", "files": [
Update my team mini app version
Update my team mini app version
206ce96b46717c0ccb208041643e8a978ea9d90f
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart", - "version": "1.27.1", + "version": "1.27.2", "private": true, "workspaces": [ "core",
bump missed version
bump missed version
56439821f213072754bf8923e9464e693719d611
--- __tests__/utils/recentSearchHistory.test.ts @@ -3,10 +3,10 @@ import { storeAssociateName, RECENT_SEARCH_HISTORY_KEY, } from '../../src/utils/recentSearchHistory'; -import {logger} from '../../src/common/logger'; +import {logger} from '../../src/common'; jest.mock('@react-native-async-storage/async-storage'); -jest.mock('../../src/common/Logger'); +jest.mock('../../src/common/logger'); describe('storeAssociateName', () => { beforeEach(() => {
feat(ui): Merge changes for drop 23 version 1 SMDV-5921
feat(ui): Merge changes for drop 23 version 1 SMDV-5921
0c9d92ff0f0091e3ff194d2f2e08dd9980501ba5
--- __tests__/components/modals/hoc/EditTeamsModal.test.tsx @@ -129,6 +129,35 @@ jest.mock('../../../../packages/associate-exp-hub-mini-app/src/constants', () => }, })); +// Mock the store slice to prevent createSlice syntax error +jest.mock('../../../../packages/associate-exp-hub-mini-app/src/store/slices/reducer', () => ({ + associateExpHubSlice: { + actions: { + updateSelectedTeamData: jest.fn(), + updateSelectedShifts: jest.fn(), + setSelectedSavedTeamId: jest.fn(), + setSelectedAllTeamId: jest.fn(), + recordTeamSwitch: jest.fn(), + setUserTeamSelectionInProgress: jest.fn(), + }, + reducer: jest.fn(), + }, + updateSelectedTeamData: jest.fn(), + updateSelectedShifts: jest.fn(), + setSelectedSavedTeamId: jest.fn(), + setSelectedAllTeamId: jest.fn(), + recordTeamSwitch: jest.fn(), + setUserTeamSelectionInProgress: jest.fn(), + DEFAULT_SELECTED_TEAM: { + teamId: '', + teamLabel: '', + teamImage: { + uri: '', + blurhash: '', + }, + }, +})); + describe('EditTeamsModal - Enhanced Coverage', () => { beforeEach(() => { jest.clearAllMocks();
feat(ui): update tests
feat(ui): update tests
47cd64bee59a3e8f1193e5d450b92481334f98ba
--- src/hooks/user.ts @@ -22,7 +22,7 @@ export const useIsSalariedOrTeamLead = () => { export const useIsHourly = () => { const user: User = useSelector(UserSelectors.getUser); const payType = user.employeeType as 'H' | 'S'; - return payType.toString().toUpperCase() === payTypes.HOURLY; + return payType?.toString()?.toUpperCase() === payTypes.HOURLY; }; export const useUserIsInRoster = () => { --- src/hooks/user.ts @@ -22,7 +22,7 @@ export const useIsSalariedOrTeamLead = () => { export const useIsHourly = () => { const user: User = useSelector(UserSelectors.getUser); const payType = user.employeeType as 'H' | 'S'; - return payType.toString().toUpperCase() === payTypes.HOURLY; + return payType?.toString()?.toUpperCase() === payTypes.HOURLY; }; export const useUserIsInRoster = () => {
update toString check
update toString check
ae9757c8a05e47383777c3b5ec16dbf52d774f85
--- core/src/changeStore/ChangeStoreModal.tsx @@ -122,7 +122,7 @@ export const ChangeStoreModal = ( }, [keyboardOpen]); const onDismiss = () => { - const currentSite = String(storeInfo.siteId); + const currentSite = storeInfo.siteId; if ( !!currentSite && @@ -131,8 +131,8 @@ export const ChangeStoreModal = ( ) { dispatch( UserActionCreators.UPDATE({ - siteId: currentSite, - workingSite: currentSite, + siteId: String(currentSite), + workingSite: String(currentSite), }), ); Telemetry.logEvent('site_changed', {
fix: change store improperly handling undefined site
fix: change store improperly handling undefined site
8584d2f6b019cf8fee42655aa75642fb877546fe
--- package-lock.json @@ -43,7 +43,7 @@ "@walmart/attendance-mini-app": "0.190.6", "@walmart/compass-sdk-rn": "4.2.0", "@walmart/config-components": "4.2.5", - "@walmart/copilot-mini-app": "^2.2.9", + "@walmart/copilot-mini-app": "^2.3.1", "@walmart/core-services": "~2.2.0", "@walmart/core-services-allspark": "~2.12.6", "@walmart/core-utils": "~2.0.5", @@ -8104,9 +8104,9 @@ } }, "node_modules/@walmart/copilot-mini-app": { - "version": "2.2.9", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-2.2.9.tgz", - "integrity": "sha512-VH4JHkNN5/GN2OsmbBDwNb/PRHDj09eM1LKX6HNcV3ljtt7jyh90/m/+5Ac3ygghcnVtvkXDeA32SWldEwoXmg==", + "version": "2.3.1", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-2.3.1.tgz", + "integrity": "sha512-AoV0YDxBapsxGMSuTq/lNM49xydLbVIPSJTCfoS33Au1grcK9rTIwaY8HcqWDXlIsu8sah2xYloDREGU0/H/6A==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -33580,9 +33580,9 @@ } }, "@walmart/copilot-mini-app": { - "version": "2.2.9", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-2.2.9.tgz", - "integrity": "sha512-VH4JHkNN5/GN2OsmbBDwNb/PRHDj09eM1LKX6HNcV3ljtt7jyh90/m/+5Ac3ygghcnVtvkXDeA32SWldEwoXmg==" + "version": "2.3.1", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-2.3.1.tgz", + "integrity": "sha512-AoV0YDxBapsxGMSuTq/lNM49xydLbVIPSJTCfoS33Au1grcK9rTIwaY8HcqWDXlIsu8sah2xYloDREGU0/H/6A==" }, "@walmart/core-services": { "version": "2.2.0", --- package.json @@ -84,7 +84,7 @@ "@walmart/attendance-mini-app": "0.190.6", "@walmart/compass-sdk-rn": "4.2.0", "@walmart/config-components": "4.2.5", - "@walmart/copilot-mini-app": "2.2.9", + "@walmart/copilot-mini-app": "2.3.1", "@walmart/core-services": "~2.2.0", "@walmart/core-services-allspark": "~2.12.6", "@walmart/core-utils": "~2.0.5",
chore: bump copilot 2.3.1
chore: bump copilot 2.3.1
f93dc2f099c8778c5e02fffb8e97892f9934a2c3
--- package-lock.json @@ -4258,9 +4258,9 @@ "integrity": "sha512-C3HNm372mNtvwuHcDL+4nK75Idsk54+1s0CdPJDKewzBbxFkQMNIuoN3Kk3y46cMkf8bkXidf7oV9gJVArsKwQ==" }, "@walmart/inbox-mini-app": { - "version": "0.29.0", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.29.0.tgz", - "integrity": "sha512-vyx+B/wExyCijLbwgtdrus9HpCah1JeJk9PDEktN0CAZx/vNgspzXqMvTAre/r0tzle3P5sQwOO4MXOWbT0DYQ==" + "version": "0.30.0", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.30.0.tgz", + "integrity": "sha512-7gBA+/M8BNEuBCkH4bxWE6+HxI3h5+ga9mwwIwIItAPYyi9kCjYCbatd1Z98LS5ikOojmyXK+HU8N3A+3qpdXg==" }, "@walmart/iteminfo-mini-app": { "version": "4.0.27", --- package.json @@ -84,7 +84,7 @@ "@walmart/gtp-shared-components": "1.2.0", "@walmart/impersonation-mini-app": "1.0.27", "@walmart/ims-print-services-ui": "0.1.19", - "@walmart/inbox-mini-app": "0.29.0", + "@walmart/inbox-mini-app": "0.30.0", "@walmart/iteminfo-mini-app": "4.0.27", "@walmart/manager-approvals-miniapp": "0.0.59", "@walmart/metrics-mini-app": "0.7.1",
version bumb inbox
version bumb inbox
19b21a55781baeb11181fa208b8787ba8b7450e0
--- src/hooks/teams.ts @@ -20,6 +20,7 @@ export const useGetTeamById = (teamId: string) => { const envConfig = useEnvironment(); return useGetTeamByIdQuery({ variables: { + businessUnitNumber: Number(storeNbr)!, storeNbr: storeNbr!, date: moment().format('YYYY-MM-DD'), teamId, @@ -52,6 +53,8 @@ export const useGetTeamsByStore = () => { const envConfig = useEnvironment(); return useGetTeamsByStoreQuery({ variables: { + includeManagement: true, + businessUnitNumber: Number(storeNbr)!, storeNbr: storeNbr!, date: moment().format('YYYY-MM-DD'), countryCode: countryCode!,
Update the query
Update the query
1ed5f6b1e8c874409783bf794a37cd0cb98f417a
--- .yarn/patches/@walmart-schedule-mini-app-npm-5.4.5-bfab6a1c85.patch --- package.json @@ -168,7 +168,7 @@ "@walmart/rn-mobile-sdk-pairing": "3.0.3", "@walmart/rn-receiving-mini-app": "2.8.44", "@walmart/roster-mini-app": "3.16.0", - "@walmart/schedule-mini-app": "patch:@walmart/schedule-mini-app@npm%3A5.4.4#~/.yarn/patches/@walmart-schedule-mini-app-npm-5.4.4-e63d1ba9c6.patch", + "@walmart/schedule-mini-app": "patch:@walmart/schedule-mini-app@npm%3A5.4.5#~/.yarn/patches/@walmart-schedule-mini-app-npm-5.4.5-bfab6a1c85.patch", "@walmart/shelfavailability-mini-app": "1.7.2", "@walmart/shop-gnfr-mini-app": "1.0.454", "@walmart/sidekick-mini-app": "4.276.5", --- yarn.lock @@ -8902,7 +8902,7 @@ __metadata: "@walmart/rn-mobile-sdk-pairing": "npm:3.0.3" "@walmart/rn-receiving-mini-app": "npm:2.8.44" "@walmart/roster-mini-app": "npm:3.16.0" - "@walmart/schedule-mini-app": "patch:@walmart/schedule-mini-app@npm%3A5.4.4#~/.yarn/patches/@walmart-schedule-mini-app-npm-5.4.4-e63d1ba9c6.patch" + "@walmart/schedule-mini-app": "patch:@walmart/schedule-mini-app@npm%3A5.4.5#~/.yarn/patches/@walmart-schedule-mini-app-npm-5.4.5-bfab6a1c85.patch" "@walmart/shelfavailability-mini-app": "npm:1.7.2" "@walmart/shop-gnfr-mini-app": "npm:1.0.454" "@walmart/sidekick-mini-app": "npm:4.276.5" @@ -9729,9 +9729,9 @@ __metadata: languageName: node linkType: hard -"@walmart/schedule-mini-app@npm:5.4.4": - version: 5.4.4 - resolution: "@walmart/schedule-mini-app@npm:5.4.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fschedule-mini-app%2F-%2F%40walmart%2Fschedule-mini-app-5.4.4.tgz" +"@walmart/schedule-mini-app@npm:5.4.5": + version: 5.4.5 + resolution: "@walmart/schedule-mini-app@npm:5.4.5::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fschedule-mini-app%2F-%2F%40walmart%2Fschedule-mini-app-5.4.5.tgz" peerDependencies: "@react-native-community/datetimepicker": ">=7.6.2" "@react-native-firebase/remote-config": ">=10.1.1" @@ -9765,13 +9765,13 @@ __metadata: redux: ">=4.0.5" reselect: ">=4.0.0" wfm-allspark-data-library: ">=7.0.0" - checksum: 10c0/a87cad4ea33fe44b413a9c74b5aaa39237716dfb78191c5513580a030eaddb44618381fbaf5bbde0d1451cf618f08588172c0cf50ef20406ab0b5b5b27abe6b0 + checksum: 10c0/35ef3c11be4d95697343a79d76719ab0d32ef56632e3e5046423b3b6fe02342ef991afa28ed6c922130236b99da419f0e61d19b337eefd547a71f3c448cc0826 languageName: node linkType: hard -"@walmart/schedule-mini-app@patch:@walmart/schedule-mini-app@npm%3A5.4.4#~/.yarn/patches/@walmart-schedule-mini-app-npm-5.4.4-e63d1ba9c6.patch": - version: 5.4.4 - resolution: "@walmart/schedule-mini-app@patch:@walmart/schedule-mini-app@npm%3A5.4.4%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252F%2540walmart%252Fschedule-mini-app%252F-%252F%2540walmart%252Fschedule-mini-app-5.4.4.tgz#~/.yarn/patches/@walmart-schedule-mini-app-npm-5.4.4-e63d1ba9c6.patch::version=5.4.4&hash=02dfd3" +"@walmart/schedule-mini-app@patch:@walmart/schedule-mini-app@npm%3A5.4.5#~/.yarn/patches/@walmart-schedule-mini-app-npm-5.4.5-bfab6a1c85.patch": + version: 5.4.5 + resolution: "@walmart/schedule-mini-app@patch:@walmart/schedule-mini-app@npm%3A5.4.5%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252F%2540walmart%252Fschedule-mini-app%252F-%252F%2540walmart%252Fschedule-mini-app-5.4.5.tgz#~/.yarn/patches/@walmart-schedule-mini-app-npm-5.4.5-bfab6a1c85.patch::version=5.4.5&hash=02dfd3" peerDependencies: "@react-native-community/datetimepicker": ">=7.6.2" "@react-native-firebase/remote-config": ">=10.1.1" @@ -9805,7 +9805,7 @@ __metadata: redux: ">=4.0.5" reselect: ">=4.0.0" wfm-allspark-data-library: ">=7.0.0" - checksum: 10c0/85ff9a004aebe04f347506aaaa0db01c6b08b0ac17f20c7d77568dad27ec89b8523705a0844898104cc611edd53782ea41d14c751d3d992cc467050be9f7d836 + checksum: 10c0/e1e21738620da1f18d579e775d33af834a5e0390106f8034e10965ca0b34225fa496af589a0c0f02624ddf3f833d5beb16e07e59e425d34ad8e9bd6a372a356b languageName: node linkType: hard
fix(schedules): Bump schedules to fix httpClient issue (#5426)
fix(schedules): Bump schedules to fix httpClient issue (#5426) Co-authored-by: Shubhang Shah - s0s0zug <Shubhang.Shah@walmart.com>
881d4301eebffd987d0a7af6333937540bd1ff05
--- __tests__/termsOfUse/__snapshots__/termsOfUseViewTest.tsx.snap @@ -33,13 +33,13 @@ exports[`TermsOfUseView matches snapshot 1`] = ` } } > - <Button + <PrimaryButton + block={true} onPress={[Function]} testID="AgreeButton" - variant="primary" > termsOfUse.iAgree - </Button> + </PrimaryButton> </View> </View> </View> --- src/navigation/AssociateHallwayNav/Banners.tsx @@ -1,5 +1,6 @@ import React, {useMemo} from 'react'; import {useSelector} from 'react-redux'; +import {createSelector} from 'reselect'; import {StackHeaderProps} from '@react-navigation/stack'; import {getFocusedRouteNameFromRoute} from '@react-navigation/native'; @@ -18,7 +19,6 @@ import { } from '@walmart/core-widget-registry'; import {ChangeStoreBanner} from '../../changeStore/ChangeStoreBanner'; import {getDataSaverOn} from '../../settings'; -import {createSelector} from 'reselect'; export const ImpersonationBanner = (props: NavigationBannerProps) => { const {route} = props; --- src/settings/thirdPartyNotices/ThirdPartyNotices.tsx @@ -23,8 +23,10 @@ export const ThirdPartyNotices = () => { }; const onShouldStartLoadWithRequest = (request: ShouldStartLoadRequest) => { - const isExternalLink = - Platform.OS === 'ios' ? request.navigationType === 'click' : true; + const isExternalLink = Platform.select({ + ios: request.navigationType === 'click', + default: true, + }); if (request.url.slice(0, 7) === 'mailto:' && isExternalLink) { Linking.openURL(request.url); --- src/termsOfUse/termsOfUseView.tsx @@ -2,7 +2,7 @@ import React from 'react'; import {View} from 'react-native'; import {useDispatch} from 'react-redux'; import {useTranslation} from '@walmart/core-services/Translations'; -import {Button} from '@walmart/gtp-shared-components'; +import {PrimaryButton} from '@walmart/gtp-shared-components'; import {useSafeAreaInsets} from 'react-native-safe-area-context'; import {TermsOfUse} from './TermsOfUse'; @@ -23,9 +23,12 @@ export const TermsOfUseScreen = () => { <TermsOfUse /> <View style={[styles.safeAreaContainer, {paddingBottom: bottom}]}> <View style={styles.buttonContainer}> - <Button variant='primary' testID='AgreeButton' onPress={onPressAgree}> + <PrimaryButton + testID='AgreeButton' + block={true} + onPress={onPressAgree}> {translate('termsOfUse.iAgree')} - </Button> + </PrimaryButton> </View> </View> </View>
settings fixes
settings fixes
752f2a1964ae9bdd3deac2850e87df9b2e660526
--- targets/US/package.json @@ -142,7 +142,7 @@ "@walmart/rfid-scan-mini-app": "2.4.4", "@walmart/rn-receiving-mini-app": "2.3.211", "@walmart/roster-mini-app": "2.9.0", - "@walmart/schedule-mini-app": "1.10.0", + "@walmart/schedule-mini-app": "1.13.0", "@walmart/shelfavailability-mini-app": "1.5.37", "@walmart/shop-gnfr-mini-app": "1.0.137", "@walmart/sidekick-mini-app": "4.84.9", --- yarn.lock @@ -4698,26 +4698,6 @@ __metadata: languageName: node linkType: hard -"@reduxjs/toolkit@npm:^2.2.8": - version: 2.4.0 - resolution: "@reduxjs/toolkit@npm:2.4.0" - dependencies: - immer: "npm:^10.0.3" - redux: "npm:^5.0.1" - redux-thunk: "npm:^3.1.0" - reselect: "npm:^5.1.0" - peerDependencies: - react: ^16.9.0 || ^17.0.0 || ^18 - react-redux: ^7.2.1 || ^8.1.3 || ^9.0.0 - peerDependenciesMeta: - react: - optional: true - react-redux: - optional: true - checksum: 10c0/8752f18ded06727386662e2b6ea626008c5eb79630bd67ed911b7958375d25882cf2c8703f10e9c56df12c0b4123eb495aead10b0e31072196478221a9f92a74 - languageName: node - linkType: hard - "@repeaterjs/repeater@npm:^3.0.4": version: 3.0.5 resolution: "@repeaterjs/repeater@npm:3.0.5" @@ -7078,7 +7058,7 @@ __metadata: "@walmart/rfid-scan-mini-app": "npm:2.4.4" "@walmart/rn-receiving-mini-app": "npm:2.3.211" "@walmart/roster-mini-app": "npm:2.9.0" - "@walmart/schedule-mini-app": "npm:1.10.0" + "@walmart/schedule-mini-app": "npm:1.13.0" "@walmart/shelfavailability-mini-app": "npm:1.5.37" "@walmart/shop-gnfr-mini-app": "npm:1.0.137" "@walmart/sidekick-mini-app": "npm:4.84.9" @@ -7866,20 +7846,20 @@ __metadata: languageName: node linkType: hard -"@walmart/schedule-mini-app@npm:1.10.0, @walmart/schedule-mini-app@npm:>=0.120.0": - version: 1.10.0 - resolution: "@walmart/schedule-mini-app@npm:1.10.0" +"@walmart/schedule-mini-app@npm:1.13.0": + version: 1.13.0 + resolution: "@walmart/schedule-mini-app@npm:1.13.0" dependencies: - "@reduxjs/toolkit": "npm:^2.2.8" "@walmart/moment-walmart": "npm:^1.0.4" "@walmart/wfm-ui": "npm:^2.4.0" - wfm-allspark-data-library: "npm:5.1.0" + wfm-allspark-data-library: "npm:6.0.0" peerDependencies: "@react-native-community/datetimepicker": ^7.6.2 "@react-native-firebase/remote-config": ">=10.1.1" "@react-navigation/elements": ">=1.3.1" "@react-navigation/native": ">=6.0.0" "@react-navigation/stack": ">=6.0.0" + "@reduxjs/toolkit": ^2.2.8 "@walmart/allspark-foundation": ">=6.17.0" "@walmart/allspark-http-client": ">=2.4.17" "@walmart/attendance-mini-app": ">=3.24.3" @@ -7899,7 +7879,7 @@ __metadata: react-redux: ">=7.2.1" redux: ">=4.0.5" reselect: ">=4.0.0" - checksum: 10c0/2eb26c7e0eb3a2ce43c679617d8f7e32b04e033c3ffcfdd5a7fafbf177c9c92376c3d87adbc9beac21d89375955f6df9667d3f48059813a97c091d4ce7f5b7fd + checksum: 10c0/4e4b7361c455bd82de33f27559458c750049e0c620dc6d2ceafe5c461ecd7bbd24d5026c12249c672d67af2b6e17b4fccff87edab461c8afd06ceecf91318c6f languageName: node linkType: hard @@ -13658,13 +13638,6 @@ __metadata: languageName: node linkType: hard -"immer@npm:^10.0.3": - version: 10.1.1 - resolution: "immer@npm:10.1.1" - checksum: 10c0/b749e10d137ccae91788f41bd57e9387f32ea6d6ea8fd7eb47b23fd7766681575efc7f86ceef7fe24c3bc9d61e38ff5d2f49c2663b2b0c056e280a4510923653 - languageName: node - linkType: hard - "immer@npm:^9.0.21": version: 9.0.21 resolution: "immer@npm:9.0.21" @@ -22745,11 +22718,9 @@ __metadata: languageName: node linkType: hard -"wfm-allspark-data-library@npm:5.1.0": - version: 5.1.0 - resolution: "wfm-allspark-data-library@npm:5.1.0" - dependencies: - "@walmart/schedule-mini-app": "npm:>=0.120.0" +"wfm-allspark-data-library@npm:6.0.0": + version: 6.0.0 + resolution: "wfm-allspark-data-library@npm:6.0.0" peerDependencies: "@walmart/allspark-foundation": "*" azure-storage: 2.10.3 @@ -22757,7 +22728,7 @@ __metadata: react: ">=18.1.0" react-native: ">=0.72.6" url: ^0.11.0 - checksum: 10c0/33db8012c2f38b22aeeeb16e520d00a6f5ab352169e1231f42a7395a12160f71b5308c3a74db7a648e87300c3aea9f7fa4a8f4ae4fafedfb3e8af1ab0f7d6e01 + checksum: 10c0/42337537b410dc659e3b8c7783e911434c343fc62306ed13dfe7ea471bcf74d8f0ec2304ecdb02c700aa2cac6187af1f7b71df6007de4524ba35417e9748b8ce languageName: node linkType: hard
bumping SMA to remove direct deps and bump wfm-allspark-data-lib
bumping SMA to remove direct deps and bump wfm-allspark-data-lib
a5a99b104b9ffd734269cf328208b16c6294a939
--- graphql.yml @@ -162,4 +162,4 @@ applications: hash: '39c45936c3b4d0020c6192b629c29860a30a5f2f70c5297c9e34dcffbaa0c7b0' queryTemplate: 'packages/me-at-walmart-athena-queries/src/upsertSupplyChainAssociatePreference.graphql' tags: - - 'v1' + - 'v1' \ No newline at end of file
feat(graphql): fix graphql.yml (#461)
feat(graphql): fix graphql.yml (#461)
8859f95fe2dfbdb75871fe10c23e1eff79da24b8
--- package-lock.json @@ -74,7 +74,7 @@ "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.5.1", - "@walmart/receipt-check-miniapp": "1.9.12", + "@walmart/receipt-check-miniapp": "1.9.14", "@walmart/redux-store": "3.1.3", "@walmart/returns-mini-app": "0.12.0", "@walmart/schedule-mini-app": "0.33.0", @@ -5861,9 +5861,9 @@ } }, "node_modules/@walmart/receipt-check-miniapp": { - "version": "1.9.12", - "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.9.12.tgz", - "integrity": "sha512-wpUbJXqx/tZQwwES65Zr/hmpebioVb/DlPh+dUD2RWH2Cs1j5KZXr3nVGUlFXAGkt1yPGCMG4sHXs/k93WQruA==", + "version": "1.9.14", + "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.9.14.tgz", + "integrity": "sha512-Jphki3mbYG0E1hr+l2PX6uAMlcbyIqoQGYUVJNCLnQUwnf0yJ3vNzB0qX06n7X+Ptb5kTdtiKQnabHXCuu22Nw==", "dependencies": { "@walmart/tcnumber": "^2.3.3", "@xstate/react": "^3.0.1", @@ -25551,9 +25551,9 @@ "integrity": "sha512-CxtyZsPMfyN6081C10uIPoP93aWLl4gHGRgiI8p7bwhIJLl8NiuOl/bqdvE3N7pAZYTeKG7lSxtc88++uvJKWA==" }, "@walmart/receipt-check-miniapp": { - "version": "1.9.12", - "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.9.12.tgz", - "integrity": "sha512-wpUbJXqx/tZQwwES65Zr/hmpebioVb/DlPh+dUD2RWH2Cs1j5KZXr3nVGUlFXAGkt1yPGCMG4sHXs/k93WQruA==", + "version": "1.9.14", + "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.9.14.tgz", + "integrity": "sha512-Jphki3mbYG0E1hr+l2PX6uAMlcbyIqoQGYUVJNCLnQUwnf0yJ3vNzB0qX06n7X+Ptb5kTdtiKQnabHXCuu22Nw==", "requires": { "@walmart/tcnumber": "^2.3.3", "@xstate/react": "^3.0.1", --- package.json @@ -116,7 +116,7 @@ "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.5.1", - "@walmart/receipt-check-miniapp": "1.9.12", + "@walmart/receipt-check-miniapp": "1.9.14", "@walmart/redux-store": "3.1.3", "@walmart/returns-mini-app": "0.12.0", "@walmart/schedule-mini-app": "0.33.0",
update for api fixes
update for api fixes
bf6dbe8f4ae8121b1770d79f3b29487e103a65e9
--- env.prod.js @@ -18,7 +18,7 @@ export default { index: 'allspark', format: 'json', }, - logLevel: 'warn', + logLevel: 'error', internalUrl: 'https://api-proxy-es2.prod-us-azure.soa-api-proxy.platform.prod.us.walmart.net', internalBffUrl:
Revert loglevel to error as per review comments
Revert loglevel to error as per review comments
65a6941b7fa68267acf04ab4bd9d16b616274c6b
--- __tests__/navigation/AssociateHallwayNav/Tabs/__snapshots__/MainTabsNavTest.tsx.snap @@ -75,7 +75,16 @@ exports[`MainTabsNav matches snapshot with badges 1`] = ` name="taskit" options={ Object { - "tabBarBadge": "", + "tabBarBadge": <FontIcon + color="#de1c24" + name="activeRefrigerationAlarm" + size={15} + />, + "tabBarBadgeStyle": Object { + "backgroundColor": "transparent", + "left": -5, + "top": -4, + }, "tabBarIcon": [Function], } } @@ -192,7 +201,12 @@ exports[`MainTabsNav matches snapshot with no badges 1`] = ` name="taskit" options={ Object { - "tabBarBadge": undefined, + "tabBarBadge": null, + "tabBarBadgeStyle": Object { + "backgroundColor": "transparent", + "left": -5, + "top": -4, + }, "tabBarIcon": [Function], } } --- src/navigation/AssociateHallwayNav/Tabs/index.tsx @@ -123,7 +123,6 @@ export function resetStackNavigator(this: any, e: any) { const target = e.target; const state = this.navigation.getState(); const route = state.routes.find((r: RouteProp<any>) => r.key === target); - // If we are leaving a tab that has its own stack navigation, then clear it if (route.state?.type === 'stack' && route.state.routes?.length > 1) { this.navigation.popToTop(); @@ -197,7 +196,15 @@ export const MainTabsNav = () => { icon: 'inactive-task', iconSelected: 'active-task', }), - tabBarBadge: highPriorityCount ? '' : undefined, + tabBarBadgeStyle: styles.alarmBadge, + // @ts-ignore + tabBarBadge: highPriorityCount ? ( + <FontIcon + size={15} + name='activeRefrigerationAlarm' + color={colors.red[100]} + /> + ) : null, }} /> ) : ( --- src/navigation/AssociateHallwayNav/Tabs/styles.ts @@ -27,7 +27,6 @@ export default StyleSheet.create({ fontFamily: 'Bogle-Bold', }, tabBarBadge: { - position: 'absolute', top: -5, transform: [{scale: 0.85}], justifyContent: 'center', @@ -36,4 +35,9 @@ export default StyleSheet.create({ fontFamily: 'Bogle-Bold', textAlign: 'center', }, + alarmBadge: { + top: -4, + left: -5, + backgroundColor: 'transparent', + }, });
Adding task it icon badge to tab config
Adding task it icon badge to tab config
508769052255f284aec4de56b15349435cfa06b6
--- .looper-pr.yml @@ -11,7 +11,7 @@ flows: - (name Yarn Set Version) yarn set version 4.4.0 - (name Yarn Version) yarn --version - (name Yarn Install) yarn install - # - (name Test Coverage) yarn run coverage + - (name Test Coverage) yarn run coverage envs: @@ -21,9 +21,9 @@ envs: ALLOW_NPM_PUSH_TO_AF: true STAGES_TO_RUN: LINT: true - UNITTEST: false + UNITTEST: true BUILD: true - SONAR_SCAN: false + SONAR_SCAN: true ARTIFACT_PUBLISH: true AUTO_PR_MONO: false JIRAPREFIX: SSMP --- .looper.yml @@ -23,4 +23,4 @@ flows: - (name Yarn Version) yarn --version - yarn install - yarn run lint - # - yarn run coverage + - yarn run coverage --- __tests__/setup.ts @@ -25,7 +25,12 @@ NativeModules.SettingsManager = { getConstants: jest.fn().mockReturnValue({}), // Add getConstants mock }; -jest.mock('expo-image'); +jest.mock('expo-image', () => ({ + Image: ({source, ...props}) => { + const React = require('react'); + return React.createElement('Image', {source, ...props}); + }, +})); jest.mock('expo-modules-core'); // ------ React Navigator Related Mocks: https://reactnavigation.org/docs/testing/ ----- //
feat(ui): update roster unit tests and looper
feat(ui): update roster unit tests and looper
e16f89f1107fa6362396c5556a7b44e4755d6759
--- __tests__/auth/__snapshots__/ErrorScreenTest.tsx.snap @@ -232,6 +232,7 @@ exports[`ErrorScreen matches snapshot when dirty and no userId/siteId 1`] = ` style={ Array [ Object { + "backgroundColor": "#FFFFFF", "borderTopColor": "#e3e4e5", "borderTopWidth": 1, "bottom": 0, @@ -468,6 +469,7 @@ exports[`ErrorScreen renders default 1`] = ` style={ Array [ Object { + "backgroundColor": "#FFFFFF", "borderTopColor": "#e3e4e5", "borderTopWidth": 1, "bottom": 0,
test case update
test case update
a18581ec6e77e641ec9a7706f63ba0e35924b590
--- core/src/navigation/USHallway/AssociateHallwayNav/MainStackNav.tsx @@ -10,11 +10,12 @@ import {Header} from '@walmart/ui-components'; import {AmpNav} from '@walmart/amp-mini-app/dist/components/AmpNav'; import {AskSamMiniApp} from '@walmart/ask-sam-mini-app'; +import {AvailableSurveysNav} from '@walmart/associate-listening-mini-app'; import {AVPNav, AVP_NAV_SCREEN_NAME} from '@walmart/avp-feature-app'; +import BackroomMiniApp from '@walmart/backroom-mini-app'; import {CheckoutMiniApp} from '@walmart/checkout-mini-app'; import {EmergencyBannerScreen} from '@walmart/emergency-mini-app'; import {ExceptionMiniApp as PinpointMiniApp} from '@walmart/exception-mini-app'; -import {AvailableSurveysNav} from '@walmart/associate-listening-mini-app'; import {FacilitiesMaintainanceStack} from '@walmart/facilities-management-miniapp'; import { FeedbackMiniApp, @@ -23,19 +24,20 @@ import { } from '@walmart/feedback-all-spark-miniapp'; import {FeedbackDialogScreen} from '@walmart/feedback-all-spark-miniapp/dist/src/feedback/containers/FeedbackDialogScreen'; import {SurveySaysDialogScreen} from '@walmart/feedback-all-spark-miniapp/dist/src/feedback/containers/SurveySaysDialogScreen'; +import { + FWBNav, + FWB_NAV_SCREEN_NAME, +} from '@walmart/financial-wellbeing-feature-app'; import InboxScreen from '@walmart/inbox-mini-app'; import {ItemInfoMiniApp} from '@walmart/iteminfo-mini-app'; +import {FieldLearningApp} from '@walmart/learning-mini-app'; import {ApprovalsMiniApp} from '@walmart/manager-approvals-miniapp'; +import MetricsFeature from '@walmart/metrics-mini-app'; import {ModFlexMiniApp} from '@walmart/mod-flex-mini-app'; -import {FieldLearningApp} from '@walmart/learning-mini-app'; -import BackroomMiniApp from '@walmart/backroom-mini-app'; -import RfidScanMiniApp from '@walmart/rfid-scan-mini-app'; +import {AuthScreen as MoneyAuthScreen} from '@walmart/money-auth-shared-components'; +import {PayStubMiniApp} from '@walmart/pay-stub-miniapp'; import {PaymentSelectionMiniApp} from '@walmart/payrollsolution_miniapp'; import {PriceChangesMiniApp} from '@walmart/price-changes-mini-app'; -import { - StoreFeatureOrdersMiniApp, - StoreFeatureOrderHistoryMiniApp, -} from '@walmart/store-feature-orders'; import { CertificationsNav, ContactInfoNav, @@ -49,25 +51,20 @@ import { SelfIdNav, } from '@walmart/profile-feature-app'; import {App as ReceiptCheckMiniApp} from '@walmart/receipt-check-miniapp'; -import { - FWBNav, - FWB_NAV_SCREEN_NAME, -} from '@walmart/financial-wellbeing-feature-app'; -import {PayStubMiniApp} from '@walmart/pay-stub-miniapp'; -import {AuthScreen as MoneyAuthScreen} from '@walmart/money-auth-shared-components'; import {ReturnsMiniApp} from '@walmart/returns-mini-app'; +import RfidScanMiniApp from '@walmart/rfid-scan-mini-app'; import ReceivingRootApp from '@walmart/rn-receiving-mini-app'; import {ShelfAvailabilityMiniApp} from '@walmart/shelfavailability-mini-app'; +import { + StoreFeatureOrdersMiniApp, + StoreFeatureOrderHistoryMiniApp, +} from '@walmart/store-feature-orders'; import {TaskItQuickActions, AlarmDetailNav} from '@walmart/taskit-mini-app'; import {TopstockMiniApp} from '@walmart/topstock-mini-app'; import {WmPlusMiniApp} from '@walmart/wm-plus-mini-app'; import {MeganavTextingScreen} from '@walmart/wmconnect-mini-app'; -import MetricsFeature from '@walmart/metrics-mini-app'; import {CreateGuardedScreens} from '../../../core/ClockOutGuard'; -import {MainTabsNav} from './Tabs'; -import {MainStackMap} from './types'; -import {MyTeamStackNav} from './Tabs/MyTeamStackNav'; import {ChangeStoreFeature} from '../../../changeStore'; import AttendanceFeature from '../../../features/attendance'; import {CallingFeature} from '../../../features/calling'; @@ -79,6 +76,9 @@ import SideKeyFeature from '../../../sideKey'; import {StoreInfoFeature} from '../../../storeInfo'; import {TermsOfUseFeature} from '../../../termsOfUse'; import {WhatsNewFeature} from '../../../whatsNew'; +import {MainTabsNav} from './Tabs'; +import {MyTeamStackNav} from './Tabs/MyTeamStackNav'; +import {MainStackMap} from './types'; //--- Main Stack --- // --- core/src/navigation/USHallway/AssociateHallwayNav/Tabs/HomeStackNav.tsx @@ -12,9 +12,9 @@ import InboxScreen from '@walmart/inbox-mini-app'; import MetricsFeature from '@walmart/metrics-mini-app'; import AttendanceFeature from '../../../../features/attendance'; +import {getInboxHeaderEnabled} from '../../../../features/inbox'; import ScheduleFeature from '../../../../features/scheduling'; import {HomeFeature} from '../../../../home'; -import {getInboxHeaderEnabled} from '../../../../features/inbox'; import {HomeStackMap, MainTabsScreenProps} from '../types'; import {styles} from './config'; --- core/src/navigation/index.tsx @@ -15,10 +15,10 @@ import {WelcomeMeFeature} from '../features/welcomeMe'; import {PermissionsFeature} from '../permissions'; import {PinScreenFeature} from '../PinAccess'; import SideKeyFeature from '../sideKey'; -import {TargetRootNav} from './TargetRootNav'; import {TermsOfUseFeature} from '../termsOfUse'; import {darkenStatusBar, hideSplashScreen} from './constants'; +import {TargetRootNav} from './TargetRootNav'; import {RootStackMap} from './types'; const RootStack = createStackNavigator<RootStackMap>();
chore: fix import order
chore: fix import order
6cb2e5044aa03268b4c70097b4fc5088fbee991a
--- src/Translations/en-US.json @@ -1,52 +0,0 @@ -{ - "total": "Total", - "done": "Done", - "searchTeamInput": { - "placeholder": "Search team member" - }, - "shiftFilter": { - "filterTitle": "Shift", - "title": "Pick your shift", - "subText": "Shift A1 is selected by default, but you can change it at any time.", - "mandatoryShiftError": "Select at least one shift to continue." - }, - "expandedTeamShiftModal": { - "shiftFilter": { - "title": "Shifts", - "subText": "Select one or more shifts." - }, - "Teams": { - "title": "Teams", - "subText": "Choose the team or group you'd would like to view" - }, - "AllTeams": { - "title": "All teams in your site", - "subText": "View any team, anytime, by selecting one below." - } - }, - "modalContent": { - "editSectionTitle": "Tap the star to save teams you’re interested in.", - "AllTeamSectionTitle": "All other teams", - "AllTeamSectionSubtext": "You can view any team, just choose one." - }, - "updateTeamsModal": { - "title": "Update team", - "supplyChainTitle": "Update team and shift", - "buttonTitle": "Apply" - }, - "editTeamsModal": { - "title": "Edit your saved teams", - "buttonTitle": "Save" - }, - "savedTeams": { - "headerText": "Your saved teams", - "bodyText": "Choose the team you'd like to view", - "textLinkLabel": "Edit saved teams", - "tagText": "Primary" - }, - "emptySavedTeams": { - "title": "No saved teams", - "subTitle": "Save teams you view often for quick access.", - "buttonText": "Choose teams to save" - } -} --- src/Translations/es-MX.json @@ -1,52 +0,0 @@ -{ - "total": "Total", - "done": "Hecho", - "searchTeamInput": { - "placeholder": "Miembro del equipo de búsqueda" - }, - "shiftFilter": { - "filterTitle": "Turno", - "title": "Elige tu turno", - "subText": "El cambio A1 está seleccionado de forma predeterminada, pero puede cambiarlo en cualquier momento.", - "mandatoryShiftError": "Seleccione al menos un turno para continuar." - }, - "expandedTeamShiftModal": { - "shiftFilter": { - "title": "Cambios", - "subText": "Seleccione uno o más turnos." - }, - "Teams": { - "title": "Equipos", - "subText": "Elija el equipo o grupo que desea ver" - }, - "AllTeams": { - "title": "Todos los equipos de tu sitio", - "subText": "Vea cualquier equipo, en cualquier momento, seleccionando uno a continuación." - } - }, - "modalContent": { - "editSectionTitle": "Toca la estrella para guardar los equipos que te interesan.", - "AllTeamSectionTitle": "Todos los demás equipos", - "AllTeamSectionSubtext": "Puedes ver cualquier equipo, solo tienes que elegir uno." - }, - "updateTeamsModal": { - "title": "Equipo de actualización", - "supplyChainTitle": "Actualizar equipo y turno", - "buttonTitle": "Aplicar" - }, - "editTeamsModal": { - "title": "Edita tus equipos guardados", - "buttonTitle": "Salvar" - }, - "savedTeams": { - "headerText": "Tus equipos guardados", - "bodyText": "Elige el equipo que te gustaría ver", - "textLinkLabel": "Editar equipo guardado", - "tagText": "Primario" - }, - "emptySavedTeams": { - "title": "No hay equipos guardados", - "subTitle": "Guarda los equipos que ves a menudo para acceder rápidamente.", - "buttonText": "Elige equipos para guardar" - } -} --- src/Translations/index.ts @@ -1,8 +0,0 @@ -import {AssociateExpHubFeature} from '../utils/feature'; -import enUS from './en-US.json'; -import esMX from './es-MX.json'; - -export default AssociateExpHubFeature.createTranslations({ - 'en-US': enUS, - 'es-MX': esMX, -});
feat(ui): fix name issue
feat(ui): fix name issue
7bb82f45a8f6090f7fe4f0e7d7eba16c273a3caa
--- __tests__/screens/AllTeams/__snapshots__/AllTeamsScreen.test.tsx.snap @@ -1522,9 +1522,11 @@ exports[`AllTeamsScreen renders the All Teams Screen correctly with Store if isS > <View accessibilityLabel="My area Stocking" + accessibilityRole="header" accessible={true} > <Text + accessibilityRole="text" style={ { "color": undefined, @@ -1538,6 +1540,7 @@ exports[`AllTeamsScreen renders the All Teams Screen correctly with Store if isS My area </Text> <Text + accessibilityRole="text" style={ { "color": undefined, @@ -1588,6 +1591,7 @@ exports[`AllTeamsScreen renders the All Teams Screen correctly with Store if isS testID="all-teams-list-section" > <Text + accessibilityRole="header" style={ { "color": undefined, @@ -1622,6 +1626,7 @@ exports[`AllTeamsScreen renders the All Teams Screen correctly with Store if isS testID="all-teams-list-section" > <Text + accessibilityRole="header" style={ { "color": undefined, @@ -1909,9 +1914,11 @@ exports[`Site and Store all teams screen should render the StoreAllTeamsScreen w > <View accessibilityLabel="My area Stocking" + accessibilityRole="header" accessible={true} > <Text + accessibilityRole="text" style={ { "color": undefined, @@ -1925,6 +1932,7 @@ exports[`Site and Store all teams screen should render the StoreAllTeamsScreen w My area </Text> <Text + accessibilityRole="text" style={ { "color": undefined, @@ -1975,6 +1983,7 @@ exports[`Site and Store all teams screen should render the StoreAllTeamsScreen w testID="all-teams-list-section" > <Text + accessibilityRole="header" style={ { "color": undefined, @@ -2009,6 +2018,7 @@ exports[`Site and Store all teams screen should render the StoreAllTeamsScreen w testID="all-teams-list-section" > <Text + accessibilityRole="header" style={ { "color": undefined, --- src/components/AssociateList/AssociateListItem.tsx @@ -73,14 +73,11 @@ export const AssociateListItem = ({ associate?.wfmSchedule?.scheduleWeeks && associate?.wfmSchedule?.scheduleWeeks?.[0]?.scheduleShifts && associate?.wfmSchedule?.scheduleWeeks?.[0].scheduleShifts?.length > 0; - // SMDV-7786, SMDV-7752, SMDV-7824: Add fallback for translation failures const clockStatusText = (() => { const translated = isClockedIn ? t('rosterScreen.userHeader.clockedIn') : t('rosterScreen.userHeader.clockedOut'); - // Detect if translation failed (returned raw key instead of translated text) - // This prevents screen readers from announcing "rosterScreen.userHeader.clockedOut" if (translated && translated.includes('rosterScreen')) { return isClockedIn ? 'Clocked In' : 'Clocked Out'; } --- src/components/ShiftSwitcherModal/ShiftSwitcherModal.tsx @@ -71,8 +71,6 @@ export const ShiftSwitcherModal = ({ style={styles.container} accessibilityViewIsModal={true} accessible={false} - // SMDV-7835: REMOVED importantForAccessibility="no-hide-descendants" - // This was hiding modal children from screen readers > {showDataErrorAlert && ( <WarningAlert @@ -100,7 +98,6 @@ export const ShiftSwitcherModal = ({ default: 'Close', fallbackLng: 'en-US', })} - // SMDV-7827: Ensure button is focusable on Android accessible={true} hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }} > @@ -109,7 +106,6 @@ export const ShiftSwitcherModal = ({ </View> <View style={styles.body} - // SMDV-7835: REMOVED importantForAccessibility="no-hide-descendants" accessible={false} > {shiftsError && ( @@ -139,7 +135,6 @@ export const ShiftSwitcherModal = ({ ? shift.shiftName : t('rosterScreen.shiftChip.allShifts') } - // SMDV-7793: Add button role and state for shift selection accessibilityRole='button' accessibilityState={{ selected: pickedShift?.shiftId === shift.shiftId }} />
chore(a11y): remove SMDV ticket inline comments
chore(a11y): remove SMDV ticket inline comments - Remove SMDV-7786, SMDV-7752, SMDV-7824 comments from AssociateListItem.tsx - Remove SMDV-7835, SMDV-7827, SMDV-7793 comments from ShiftSwitcherModal.tsx - Update test snapshots for accessibility changes in StoreAllTeamsScreen - Verify Clock in/out strings use translations (rosterScreen.userHeader.clockedIn/clockedOut) - Clean up code comments while preserving accessibility functionality 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
e9ec7ba9889c14954cc1d5be6c21d7c9f46cc436
--- packages/allspark-foundation-hub/src/HubFeature/Hub/Container/Screens/HubDashboard.tsx @@ -246,12 +246,6 @@ export const HubDashboard = ({ /** Bottom sheet update */ const navigation = useNavigation(); - const resetTo = (screen: string) => { - navigation.reset({ - index: 0, - routes: [{ name: screen }], - }); - }; const routeParams: any = useRoute()?.params; const { --- packages/allspark-foundation-hub/src/HubFeature/index.tsx @@ -4,4 +4,3 @@ export * from './Hub/TeamSwitcher'; export * from './Onboarding/TeamOnboarding'; export * from './BottomSheet'; export * from './Hub/HubWidget'; -export * from './ClockOut';
Update the clock out changes
Update the clock out changes
3a250e81ec3ac843b5576d3feb98f91408b3f8dc
--- src/screens/RosterScreen.tsx @@ -60,6 +60,12 @@ type Props = { parentNavigation: StackNavigationProp<ParamListBase>; }; +interface TeamInfo { + teamId: string; + teamName: string; + members: Associate[]; +} + export const RosterScreen: React.FC<Props> = ({navigation}) => { const {bottom: bottomInset} = useSafeAreaInsets(); const storeId = useSelector(SiteSelectors.getUserWorkingSite); @@ -133,7 +139,9 @@ export const RosterScreen: React.FC<Props> = ({navigation}) => { [associates.length, startAssociateText], ); - const goToViewTeamScreen = () => { + + //TODO: Create transform method to aggregate the correct TeamInfo data + const goToViewTeamScreen = (teamInfo: TeamInfo) => { navigation.navigate('texting.viewTeam'); }; @@ -180,7 +188,12 @@ export const RosterScreen: React.FC<Props> = ({navigation}) => { <RosterFilters /> {teams?.length ? ( - <TeamChatCard style={styles.teamCard} onViewTeamButtonPress={goToViewTeamScreen} /> + <TeamChatCard + style={styles.teamCard} + onViewTeamButtonPress={(teamInfo: TeamInfo) => + goToViewTeamScreen(teamInfo) + } + /> ) : ( <StoreChatCard style={styles.teamCard} /> )} --- src/screens/RosterScreen.tsx @@ -60,6 +60,12 @@ type Props = { parentNavigation: StackNavigationProp<ParamListBase>; }; +interface TeamInfo { + teamId: string; + teamName: string; + members: Associate[]; +} + export const RosterScreen: React.FC<Props> = ({navigation}) => { const {bottom: bottomInset} = useSafeAreaInsets(); const storeId = useSelector(SiteSelectors.getUserWorkingSite); @@ -133,7 +139,9 @@ export const RosterScreen: React.FC<Props> = ({navigation}) => { [associates.length, startAssociateText], ); - const goToViewTeamScreen = () => { + + //TODO: Create transform method to aggregate the correct TeamInfo data + const goToViewTeamScreen = (teamInfo: TeamInfo) => { navigation.navigate('texting.viewTeam'); }; @@ -180,7 +188,12 @@ export const RosterScreen: React.FC<Props> = ({navigation}) => { <RosterFilters /> {teams?.length ? ( - <TeamChatCard style={styles.teamCard} onViewTeamButtonPress={goToViewTeamScreen} /> + <TeamChatCard + style={styles.teamCard} + onViewTeamButtonPress={(teamInfo: TeamInfo) => + goToViewTeamScreen(teamInfo) + } + /> ) : ( <StoreChatCard style={styles.teamCard} /> )}
adding teamInfo type
adding teamInfo type
cb0f98de009d9277ecb134b10f0d74ab9e892bc9
--- android/app/build.gradle @@ -134,7 +134,7 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 128 + versionCode 129 versionName "1.0.11" } splits { --- ios/AllSpark/Info.plist @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>128</string> + <string>129</string> <key>FirebaseAutomaticScreenReportingEnabled</key> <false /> <key>LSApplicationQueriesSchemes</key>
Incrementing build number
Incrementing build number
6c060be208b0cb0dbdd45fa6ae9f6f0f9dce3740
--- packages/allspark-foundation-hub/__tests__/supplyChain/Modals/__snapshots__/UpdateTeamsModal.test.tsx.snap @@ -233,6 +233,7 @@ exports[`UpdateTeams Modal Error screen when network fails displays ModalErrorSc exports[`UpdateTeamsModal renders ScrollView with correct props 1`] = ` [ <RCTScrollView + onScroll={[Function]} stickyHeaderIndices={ [ 0, @@ -569,6 +570,7 @@ exports[`UpdateTeamsModal renders ScrollView with correct props 1`] = ` exports[`UpdateTeamsModal renders UpdateTeamsModal correctly 1`] = ` [ <RCTScrollView + onScroll={[Function]} stickyHeaderIndices={ [ 0, --- packages/allspark-foundation-hub/src/SupplyChain/Modals/EditSavedTeamModal/EditSavedTeamsModal.tsx @@ -4,8 +4,8 @@ import { } from '@walmart/allspark-foundation'; import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation'; import { Body } from '@walmart/gtp-shared-components/dist'; -import React, { useCallback, useState } from 'react'; -import { ScrollView, SectionList, View } from 'react-native'; +import React, { useCallback, useRef, useState } from 'react'; +import { Animated, ScrollView, SectionList, View } from 'react-native'; import { useSelector } from 'react-redux'; import { SiteSelectors } from '@walmart/allspark-foundation/Site'; import { trimToFortyCharacters } from '../../../SupplyChain/Utils/utils'; @@ -47,6 +47,7 @@ export const EditSavedTeamsModal = ({ loading, refetch: refetchAllTeams, } = useGetSupplyChainAllTeamsBySite(); + const scrollPosition = useRef(new Animated.Value(0)).current; const showAllTeamsList = useSelector(allTeamsListEnabled); const showSearchInput = useSelector(teamSearchInputEnabled); @@ -119,6 +120,15 @@ export const EditSavedTeamsModal = ({ refetchAllTeams(); }, [refetchAllTeams]); + const onScroll = Animated.event( + [ + { + nativeEvent: { contentOffset: { y: scrollPosition } }, + }, + ], + { useNativeDriver: false } + ); + if (loading) { return <EditSavedTeamsSectionLoading />; } @@ -154,6 +164,7 @@ export const EditSavedTeamsModal = ({ stickyHeaderIndices={[0]} style={modalStyles.rootContainer} contentContainerStyle={modalStyles.contentContainer} + onScroll={onScroll} > <ModalHeader title={t('editSavedTeamsModal.title')} --- packages/allspark-foundation-hub/src/SupplyChain/Modals/UpdateTeamsModal/UpdateTeamsModal.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useCallback, useRef, useState } from 'react'; -import { ScrollView, View } from 'react-native'; +import { Animated, ScrollView, View } from 'react-native'; import { Divider } from '@walmart/gtp-shared-components'; import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation'; import { ShiftFilterList } from '../../Components/ShiftFilter/ShiftFilterList'; @@ -51,6 +51,7 @@ export const UpdateTeamsModal = ({ error: allTeamsError, refetch: refetchAllSiteTeams, } = useGetSupplyChainAllTeamsBySite(); + const scrollPosition = useRef(new Animated.Value(0)).current; const { shiftPreferenceData } = useGetSupplyChainTeamsPreferenceQuery(); const division = useSelector(SiteSelectors.getWorkingSiteDivision); @@ -177,6 +178,15 @@ export const UpdateTeamsModal = ({ } }, [showMandatoryShiftAlert]); + const onScroll = Animated.event( + [ + { + nativeEvent: { contentOffset: { y: scrollPosition } }, + }, + ], + { useNativeDriver: false } + ); + if (allTeamsError) { return ( <ModalErrorScreen @@ -207,6 +217,7 @@ export const UpdateTeamsModal = ({ stickyHeaderIndices={[0]} style={styles.rootContainer} ref={scrollViewRef} + onScroll={onScroll} > <ModalHeader title={t('updateTeamsModal.screenTitle')}
feat(ui): updated snaps
feat(ui): updated snaps
de189a72ce4f6ca599bba59443d78272652f2309
--- __tests__/screens/RosterScreenTest.tsx @@ -3,6 +3,7 @@ import React from 'react'; import {screen} from '@testing-library/react-native'; import {RosterScreen} from '../../src/screens/RosterScreen'; import {useNavigation} from '@react-navigation/native'; +// @ts-ignore import {renderWithProviders} from '../harness/redux'; describe('RosterScreen', () => { --- package-lock.json @@ -79,7 +79,7 @@ "promise": "^8.3.0", "react": "^18.2.0", "react-i18next": "^12.0.0", - "react-native": "~0.70.8", + "react-native": "0.70.6", "react-native-apollo-devtools-client": "^1.0.4", "react-native-app-auth": "^6.4.3", "react-native-background-timer": "^2.4.1", @@ -24269,9 +24269,9 @@ } }, "node_modules/react-native": { - "version": "0.70.8", - "resolved": "https://npme.walmart.com/react-native/-/react-native-0.70.8.tgz", - "integrity": "sha512-O3ONJed9W/VEEVWsbZcwyMDhnEvw7v9l9enqWqgbSGLzHfh6HeIGMCNmjz+kRsHnC7AiF47fupWfgYX7hNnhoQ==", + "version": "0.70.6", + "resolved": "https://npme.walmart.com/react-native/-/react-native-0.70.6.tgz", + "integrity": "sha512-xtQdImPHnwgraEx3HIZFOF+D1hJ9bC5mfpIdUGoMHRws6OmvHAjmFpO6qfdnaQ29vwbmZRq7yf14sbury74R/w==", "dev": true, "license": "MIT", "dependencies": { @@ -46393,9 +46393,9 @@ } }, "react-native": { - "version": "0.70.8", - "resolved": "https://npme.walmart.com/react-native/-/react-native-0.70.8.tgz", - "integrity": "sha512-O3ONJed9W/VEEVWsbZcwyMDhnEvw7v9l9enqWqgbSGLzHfh6HeIGMCNmjz+kRsHnC7AiF47fupWfgYX7hNnhoQ==", + "version": "0.70.6", + "resolved": "https://npme.walmart.com/react-native/-/react-native-0.70.6.tgz", + "integrity": "sha512-xtQdImPHnwgraEx3HIZFOF+D1hJ9bC5mfpIdUGoMHRws6OmvHAjmFpO6qfdnaQ29vwbmZRq7yf14sbury74R/w==", "dev": true, "requires": { "@jest/create-cache-key-function": "^27.0.1", --- package.json @@ -101,7 +101,7 @@ "promise": "^8.3.0", "react": "^18.2.0", "react-i18next": "^12.0.0", - "react-native": "~0.70.8", + "react-native": "0.70.6", "react-native-apollo-devtools-client": "^1.0.4", "react-native-app-auth": "^6.4.3", "react-native-background-timer": "^2.4.1", --- src/navigation/utils.ts @@ -81,7 +81,10 @@ export const buildMessageScreenOptions = ( }); }; -export const goToWeeklySchedule = (WINNumbers: string[], teamName?: string) => { +export const goToWeeklySchedule = ( + WINNumbers: string[] | undefined, + teamName?: string, +) => { navigate('scheduleScreen', { // @ts-ignore screen: 'scheduleNav.roster', --- src/screens/RosterScreen.tsx @@ -101,7 +101,7 @@ export const RosterHeader: React.FC<{teamInfo?: TeamInfo}> = ({teamInfo}) => { variant='tertiary' size='small' onPress={() => goToWeeklySchedule(associateWINs, teamInfo?.teamName)} - disabled={true} + disabled={false} UNSAFE_style={styles.weeklyScheduleButton}> Weekly schedule </Button> --- __tests__/screens/RosterScreenTest.tsx @@ -3,6 +3,7 @@ import React from 'react'; import {screen} from '@testing-library/react-native'; import {RosterScreen} from '../../src/screens/RosterScreen'; import {useNavigation} from '@react-navigation/native'; +// @ts-ignore import {renderWithProviders} from '../harness/redux'; describe('RosterScreen', () => { --- package-lock.json @@ -79,7 +79,7 @@ "promise": "^8.3.0", "react": "^18.2.0", "react-i18next": "^12.0.0", - "react-native": "~0.70.8", + "react-native": "0.70.6", "react-native-apollo-devtools-client": "^1.0.4", "react-native-app-auth": "^6.4.3", "react-native-background-timer": "^2.4.1", @@ -24269,9 +24269,9 @@ } }, "node_modules/react-native": { - "version": "0.70.8", - "resolved": "https://npme.walmart.com/react-native/-/react-native-0.70.8.tgz", - "integrity": "sha512-O3ONJed9W/VEEVWsbZcwyMDhnEvw7v9l9enqWqgbSGLzHfh6HeIGMCNmjz+kRsHnC7AiF47fupWfgYX7hNnhoQ==", + "version": "0.70.6", + "resolved": "https://npme.walmart.com/react-native/-/react-native-0.70.6.tgz", + "integrity": "sha512-xtQdImPHnwgraEx3HIZFOF+D1hJ9bC5mfpIdUGoMHRws6OmvHAjmFpO6qfdnaQ29vwbmZRq7yf14sbury74R/w==", "dev": true, "license": "MIT", "dependencies": { @@ -46393,9 +46393,9 @@ } }, "react-native": { - "version": "0.70.8", - "resolved": "https://npme.walmart.com/react-native/-/react-native-0.70.8.tgz", - "integrity": "sha512-O3ONJed9W/VEEVWsbZcwyMDhnEvw7v9l9enqWqgbSGLzHfh6HeIGMCNmjz+kRsHnC7AiF47fupWfgYX7hNnhoQ==", + "version": "0.70.6", + "resolved": "https://npme.walmart.com/react-native/-/react-native-0.70.6.tgz", + "integrity": "sha512-xtQdImPHnwgraEx3HIZFOF+D1hJ9bC5mfpIdUGoMHRws6OmvHAjmFpO6qfdnaQ29vwbmZRq7yf14sbury74R/w==", "dev": true, "requires": { "@jest/create-cache-key-function": "^27.0.1", --- package.json @@ -101,7 +101,7 @@ "promise": "^8.3.0", "react": "^18.2.0", "react-i18next": "^12.0.0", - "react-native": "~0.70.8", + "react-native": "0.70.6", "react-native-apollo-devtools-client": "^1.0.4", "react-native-app-auth": "^6.4.3", "react-native-background-timer": "^2.4.1", --- src/navigation/utils.ts @@ -81,7 +81,10 @@ export const buildMessageScreenOptions = ( }); }; -export const goToWeeklySchedule = (WINNumbers: string[], teamName?: string) => { +export const goToWeeklySchedule = ( + WINNumbers: string[] | undefined, + teamName?: string, +) => { navigate('scheduleScreen', { // @ts-ignore screen: 'scheduleNav.roster', --- src/screens/RosterScreen.tsx @@ -101,7 +101,7 @@ export const RosterHeader: React.FC<{teamInfo?: TeamInfo}> = ({teamInfo}) => { variant='tertiary' size='small' onPress={() => goToWeeklySchedule(associateWINs, teamInfo?.teamName)} - disabled={true} + disabled={false} UNSAFE_style={styles.weeklyScheduleButton}> Weekly schedule </Button>
adding winds to link
adding winds to link
e3c5a54ddc8bb9da234b0ed908a46fa0826a0619
--- packages/allspark-foundation/src/FeatureRunner/components/UserHeader.tsx @@ -1,6 +1,12 @@ import React from 'react'; -import { useSelector } from 'react-redux'; -import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native'; +import { useDispatch, useSelector } from 'react-redux'; +import { + StyleProp, + StyleSheet, + TouchableOpacity, + View, + ViewStyle, +} from 'react-native'; import { Heading, Icons, @@ -8,8 +14,9 @@ import { Body, colors, } from '@walmart/gtp-shared-components'; -import { UserSelectors } from '../../User'; +import { UserActionCreators, UserSelectors } from '../../User'; import { AuthService } from '../../Auth'; +import { AllsparkNavigationClient } from '../../Navigation'; const styles = StyleSheet.create({ header: { @@ -37,14 +44,36 @@ export const UserHeader = (props: { style?: StyleProp<ViewStyle> }) => { const user = useSelector(UserSelectors.getOriginalUser); + const dispatch = useDispatch(); + + const openSitePrompt = () => { + AllsparkNavigationClient.openModal('Allspark.Prompt', { + title: 'Enter Site ID', + action: 'Submit', + onSubmit: (val: string) => { + const siteId = val.replace(/[^0-9]/g, ''); + dispatch( + UserActionCreators.UPDATE({ + siteId, + workingSite: siteId, + }) + ); + }, + keyboardType: 'number-pad', + maxLength: 5, + }); + }; + return ( <View style={[styles.header, style]}> <View> <Heading>{`Hey there${!!user && `, ${user.userId}`}!`}</Heading> - <View style={styles.siteRow}> - <Icons.StoreIcon UNSAFE_style={styles.siteIcon} /> - {!!user?.siteId && <Body>Store {`${user.siteId}`}</Body>} - </View> + <TouchableOpacity onPress={openSitePrompt}> + <View style={styles.siteRow}> + <Icons.StoreIcon UNSAFE_style={styles.siteIcon} /> + {!!user?.siteId && <Body>Store {`${user.siteId}`}</Body>} + </View> + </TouchableOpacity> <View style={styles.separator} /> </View> <View>
feat(ui): update pull down to refresh
feat(ui): update pull down to refresh
e8c23ac43b1b3ddf79d827c3eb20dc42e4bb9e82
--- packages/allspark-foundation/src/Navigation/components/Header.tsx @@ -66,6 +66,7 @@ export const AllsparkStackHeaderOptions = { headerRightContainerStyle: AllsparkStackHeaderStyles.headerRightStyle, headerStyle: AllsparkStackHeaderStyles.primaryHeader, headerBackTitleVisible: false, + headerBackTitle: '', headerBackImage: BackButtonIcon, } as const;
fix(header): back title not hidden with visibility setting alone
fix(header): back title not hidden with visibility setting alone
a2be788aea89a59f20220303c4e57ba664ab0e3f
--- package-lock.json @@ -4563,9 +4563,9 @@ } }, "@walmart/ui-components": { - "version": "1.3.0-rc.3", - "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.3.0-rc.3.tgz", - "integrity": "sha512-hDzRBuZZvLzwsuVtLtPKQH9WFjx1tTM5J4r8w68f57zLD3pKF1lkLnehG6hQp0oNtkYyTVQMuhxGk9QSQTmJhg==", + "version": "1.3.0-beta.11", + "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.3.0-beta.11.tgz", + "integrity": "sha512-1C++4yF6xppcO67J1cFNDqd4h+/Mmg0j/zPHu+GISyeqNRugvl7LZxF7Y/H3DqLXDNEVls6KpsdI7ybU3s/BnQ==", "requires": { "react-native-calendars": "1.299.0" } @@ -16306,6 +16306,11 @@ "prop-types": "^15.7.2" } }, + "react-native-background-timer": { + "version": "2.4.1", + "resolved": "https://npme.walmart.com/react-native-background-timer/-/react-native-background-timer-2.4.1.tgz", + "integrity": "sha512-TE4Kiy7jUyv+hugxDxitzu38sW1NqjCk4uE5IgU2WevLv7sZacaBc6PZKOShNRPGirLl1NWkaG3LDEkdb9Um5g==" + }, "react-native-barcode-builder": { "version": "2.0.0", "resolved": "https://npme.walmart.com/react-native-barcode-builder/-/react-native-barcode-builder-2.0.0.tgz", --- package.json @@ -73,8 +73,8 @@ "@walmart/allspark-health-survey-mini-app": "0.0.43", "@walmart/allspark-home-mini-app": "0.5.22", "@walmart/allspark-me-mini-app": "0.31.2", - "@walmart/ask-sam-mini-app": "0.40.4", "@walmart/allspark-neon-core": "0.1.25", + "@walmart/ask-sam-mini-app": "0.40.4", "@walmart/config-components": "1.0.35", "@walmart/counts-component-miniapp": "0.0.28", "@walmart/exception-mini-app": "0.38.1", @@ -95,14 +95,14 @@ "@walmart/react-native-logger": "^1.28.0", "@walmart/react-native-shared-navigation": "^0.4.0", "@walmart/react-native-sumo-sdk": "2.1.0", - "@walmart/refrigeration-alarms-mini-app": "1.21.0", "@walmart/redux-store": "1.1.25", + "@walmart/refrigeration-alarms-mini-app": "1.21.0", "@walmart/schedule-mini-app": "0.6.0", "@walmart/settings-mini-app": "1.5.0", "@walmart/shelfavailability-mini-app": "0.6.8", - "@walmart/time-clock-mini-app": "0.4.25", - "@walmart/ui-components": "1.3.0-rc.3", "@walmart/taskit-mini-app": "0.119.0-rc.0", + "@walmart/time-clock-mini-app": "0.4.25", + "@walmart/ui-components": "1.3.0-beta.11", "@walmart/welcomeme-mini-app": "0.30.4", "@walmart/wfm-ui": "^0.1.50", "axios-cache-adapter": "2.7.3", @@ -118,6 +118,7 @@ "react": "^17.0.2", "react-i18next": "^11.7.3", "react-native": "^0.66.4", + "react-native-background-timer": "^2.4.1", "react-native-barcode-builder": "^2.0.0", "react-native-biometrics": "^2.1.4", "react-native-check-app-install": "0.0.5",
package update
package update
e22800e7533e0c07fafd6981cef20ac3db8f24dd
--- package-lock.json @@ -2963,11 +2963,11 @@ } }, "@walmart/allspark-health-survey-mini-app": { - "version": "0.0.22", - "resolved": "https://npme.walmart.com/@walmart/allspark-health-survey-mini-app/-/allspark-health-survey-mini-app-0.0.22.tgz", - "integrity": "sha512-uYHb6Ys9Bl2sBBQqBV3neOrxZ/J58QrYDEgYqoLJwcdxlq3dhl3bmTTrjkxmDAlPrv4ymbjJ2c8ZIz3juECvJw==", + "version": "0.0.24", + "resolved": "https://npme.walmart.com/@walmart/allspark-health-survey-mini-app/-/allspark-health-survey-mini-app-0.0.24.tgz", + "integrity": "sha512-Z6vW8WEVpRy+cMMW+zsbIoaUFweJekOC0/ZLhFLGSKh9FHLlVwIPqNErLrOEWW3n3pUFAxbJKLKHJ3quLqfjnA==", "requires": { - "@walmart/patient-portal-mobile": "^2.1.1", + "@walmart/patient-portal-mobile": "^2.1.2", "crypto-js": "^3.3.0", "moment": "^2.29.1", "react-native-qrcode-svg": "^6.0.6", @@ -3067,9 +3067,9 @@ "integrity": "sha512-iTkDEL7GeYYS8laso4ECQ7DyHgBxnJh/uP5PJNQMHZyKb8niIwIwb19HFLuGBVRa9vZIjTz7mChSydbIn4KV0w==" }, "@walmart/patient-portal-mobile": { - "version": "2.1.1", - "resolved": "https://npme.walmart.com/@walmart/patient-portal-mobile/-/patient-portal-mobile-2.1.1.tgz", - "integrity": "sha512-qkfy/IOGWyq0wSfyWFSo+7V8YgtgGI318QrpNdcqeFk7Vsoc/irxnJ8Aa5iMPeTlSb8qsa+CJUJBixYTPwikxQ==", + "version": "2.1.2", + "resolved": "https://npme.walmart.com/@walmart/patient-portal-mobile/-/patient-portal-mobile-2.1.2.tgz", + "integrity": "sha512-i9G+DVtVWWSQoEoJyaSJ6r8jPjziq6ggTHxYbbUtgFyRtJuHUvYVa4DlfwyUNfGeSYjmLCKlgCj4cBj7Kc4daA==", "requires": { "@react-native-community/datetimepicker": "^3.0.3", "@walmart/react-native-collapsible": "1.5.3", @@ -3127,16 +3127,16 @@ "integrity": "sha512-/2QStrLatWqZuSGvGhosemz4kt3dg95Zo5TAvE2AV+GOod1Qyuqzbz70/5CAifuAOPTtK/ihXMCj5xwlMA5SVw==" }, "@walmart/schedule-mini-app": { - "version": "0.2.52", - "resolved": "https://npme.walmart.com/@walmart/schedule-mini-app/-/schedule-mini-app-0.2.52.tgz", - "integrity": "sha512-NDWiy4K/Q2TgQRh1e+UXMd/Kff3wh07pb+1Y2+Nfxbn4b1xP9ZdB867zwHt1kmEvHFEXqfKXSgLWGnWqH/bUPw==", + "version": "0.2.54", + "resolved": "https://npme.walmart.com/@walmart/schedule-mini-app/-/schedule-mini-app-0.2.54.tgz", + "integrity": "sha512-WR/inpPtmLG9mgPhCI3tSM5P6u1n/J7tcDBF62t2/0CKxxUr9ZLEl4OXAtt5B2/RxEn0977SlTnTWBbEAIlm+g==", "requires": { "@walmart/moment-walmart": "^1.0.4", "@walmart/wfm-ui": "0.1.38", "crypto-js": "^3.3.0", "react-native-tab-view": "^2.15.2", "reselect": "^4.0.0", - "wfm-allspark-data-library": "0.0.13" + "wfm-allspark-data-library": "0.0.14" }, "dependencies": { "moment": { @@ -3145,9 +3145,9 @@ "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" }, "wfm-allspark-data-library": { - "version": "0.0.13", - "resolved": "https://npme.walmart.com/wfm-allspark-data-library/-/wfm-allspark-data-library-0.0.13.tgz", - "integrity": "sha512-v5AejVnCJyCP6+AgJuSMMqseH/eNanbVuY1zEPZ0apheOmWjOBD7Lp/U36lqm8QhfQf44bLRKWMUA/oDfpsc1g==", + "version": "0.0.14", + "resolved": "https://npme.walmart.com/wfm-allspark-data-library/-/wfm-allspark-data-library-0.0.14.tgz", + "integrity": "sha512-mQN8Uz+r5EbP1FDB2LQZYBFu7RbL41McEtcmfy/U8jUvpPd1hinMe+Pn+c2Jc2sDb1RNp4O8LNcHiRT2zXslyw==", "requires": { "azure-storage": "2.10.3", "moment": "2.24.0", --- package.json @@ -46,7 +46,7 @@ "@react-navigation/stack": "^5.9.0", "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@types/lodash": "^4.14.159", - "@walmart/allspark-health-survey-mini-app": "0.0.22", + "@walmart/allspark-health-survey-mini-app": "0.0.24", "@walmart/allspark-home-mini-app": "^0.1.8", "@walmart/allspark-me-mini-app": "0.0.17", "@walmart/ask-sam-mini-app": "0.8.0", @@ -62,7 +62,7 @@ "@walmart/react-native-logger": "^1.17.0", "@walmart/react-native-shared-navigation": "^0.3.0", "@walmart/redux-store": "^1.0.11", - "@walmart/schedule-mini-app": "0.2.52", + "@walmart/schedule-mini-app": "0.2.54", "@walmart/settings-mini-app": "1.1.12", "@walmart/time-clock-mini-app": "0.1.16", "@walmart/ui-components": "1.0.91",
Bumping health and schedule (#290)
Bumping health and schedule (#290) * Bumping health and schedule * Bumping health and schedule
ee2d8d38035b837f530ec6ef8df2139011bdbadf
--- src/managerExperience/components/AssociateList/AssociateListRenderer.tsx @@ -1,22 +0,0 @@ -import React from 'react'; -import {AssociateListItem} from './AssociateListItem'; -import {AssociateListRenderItem} from './types'; - -export const AssociateListRenderer = ({ - item, - index, - extraData, -}: AssociateListRenderItem) => { - const {totalAssociates, handleMessageAssociate, handleViewAssociateSchedule} = - extraData; - return ( - <AssociateListItem - associate={item} - isLastItem={index === totalAssociates - 1} - handleMessageAssociate={() => handleMessageAssociate(item)} - handleViewSchedule={() => { - handleViewAssociateSchedule(item.associateId); - }} - /> - ); -}; --- src/managerExperience/components/AssociateList/types.ts @@ -1,17 +1,5 @@ import {Associate} from '../../../types'; -export interface AssociateListItemExtraData { - totalAssociates: number; - handleMessageAssociate: (associate: Associate) => void; - handleViewAssociateSchedule: (associateId: string) => void; -} - -export type AssociateListRenderItem = { - item: Associate; - index: number; - extraData: AssociateListItemExtraData; -}; - export interface AssociateListItemProps { associate: Associate; isLastItem?: boolean;
refactor: removed unnecessary associate renderer
refactor: removed unnecessary associate renderer
39ccc5074dd82d68883c655f952ec60c5612f7b6
--- package-lock.json @@ -3032,9 +3032,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "0.9.53", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.9.53.tgz", - "integrity": "sha512-Du8hlbWavSriYLbCJHi582nbgWsG2keOlJaa7Qhekf1OvgsZXOd+YD71Mod+L/FflhCJGBoUr6PvCZ2DSqvKsA==", + "version": "0.10.1", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.10.1.tgz", + "integrity": "sha512-SawjtKYnk7pwSA93027rkhpeyLZ62HOcdI1fd4PtjyP1WmrCb3N5GWvFfGDS+OLfYLIA2akl8+N4cz6e4vlZAA==", "requires": { "apisauce": "^1.1.2", "lodash": "^4.17.19", --- package.json @@ -50,7 +50,7 @@ "@walmart/allspark-health-survey-mini-app": "0.0.24", "@walmart/allspark-home-mini-app": "0.1.10", "@walmart/allspark-me-mini-app": "0.0.22", - "@walmart/ask-sam-mini-app": "0.9.53", + "@walmart/ask-sam-mini-app": "0.10.1", "@walmart/config-components": "1.0.12", "@walmart/feedback-all-spark-miniapp": "0.0.35", "@walmart/functional-components": "1.0.23",
Ask Sam bump for CCM integration (#343)
Ask Sam bump for CCM integration (#343) * Incrementing ask sam and version code * iOS build version increment * Reverting native build code increment Co-authored-by: rlane1 <rlane1@walmart.com>
7c381d828515000d4d784a0dc78137325210b844
--- targets/US/ios/Podfile.lock @@ -1944,6 +1944,8 @@ PODS: - React-Core - react-native-view-shot (3.8.0): - React-Core + - react-native-walmart-cookies (1.0.1): + - React-Core - react-native-webex-sdk (0.4.3): - React-Core - react-native-logger @@ -2367,6 +2369,7 @@ DEPENDENCIES: - react-native-splash-screen (from `../../../node_modules/react-native-splash-screen`) - react-native-video (from `../../../node_modules/react-native-video`) - react-native-view-shot (from `../../../node_modules/react-native-view-shot`) + - "react-native-walmart-cookies (from `../../../node_modules/@walmart/react-native-cookies`)" - "react-native-webex-sdk (from `../../../node_modules/@walmart/react-native-webex-sdk`)" - react-native-webview (from `../../../node_modules/react-native-webview`) - react-native-wm-app-review (from `../../../node_modules/react-native-wm-app-review`) @@ -2621,6 +2624,8 @@ EXTERNAL SOURCES: :path: "../../../node_modules/react-native-video" react-native-view-shot: :path: "../../../node_modules/react-native-view-shot" + react-native-walmart-cookies: + :path: "../../../node_modules/@walmart/react-native-cookies" react-native-webex-sdk: :path: "../../../node_modules/@walmart/react-native-webex-sdk" react-native-webview: @@ -2851,6 +2856,7 @@ SPEC CHECKSUMS: react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457 react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253 react-native-view-shot: 6b7ed61d77d88580fed10954d45fad0eb2d47688 + react-native-walmart-cookies: 8edc1df5a8434eb006c5d4435571758e76f2e500 react-native-webex-sdk: 14e111e3fe6e7722a40958799645939a800e34c4 react-native-webview: d33e2db8925d090871ffeb232dfa50cb3a727581 react-native-wm-app-review: 97a8d62495b3d0a83e40dbebea7e86f4ae2f4488 --- targets/US/package.json @@ -127,6 +127,7 @@ "@walmart/payrollsolution_miniapp": "0.141.17", "@walmart/price-changes-mini-app": "1.10.18", "@walmart/profile-feature-app": "patch:@walmart/profile-feature-app@npm%3A1.138.3#~/.yarn/patches/@walmart-profile-feature-app-npm-1.138.3-9802440ed6.patch", + "@walmart/react-native-cookies": "1.0.1", "@walmart/react-native-encrypted-storage": "~1.1.3", "@walmart/react-native-env": "~6.3.20", "@walmart/react-native-logger": "1.35.0", @@ -153,7 +154,7 @@ "@walmart/walmart-fiscal-week": "^0.3.6", "@walmart/welcomeme-mini-app": "0.96.0", "@walmart/wfm-ui": "1.6.0", - "@walmart/wm-plus-mini-app": "0.12.21", + "@walmart/wm-plus-mini-app": "1.0.0", "@walmart/wmconnect-mini-app": "2.6.0", "axios": "~1.6.0", "axios-cache-adapter": "patch:axios-cache-adapter@npm%3A2.7.3#~/.yarn/patches/axios-cache-adapter-npm-2.7.3-26c357b785.patch", --- yarn.lock @@ -7032,6 +7032,7 @@ __metadata: "@walmart/payrollsolution_miniapp": "npm:0.141.17" "@walmart/price-changes-mini-app": "npm:1.10.18" "@walmart/profile-feature-app": "patch:@walmart/profile-feature-app@npm%3A1.138.3#~/.yarn/patches/@walmart-profile-feature-app-npm-1.138.3-9802440ed6.patch" + "@walmart/react-native-cookies": "npm:1.0.1" "@walmart/react-native-encrypted-storage": "npm:~1.1.3" "@walmart/react-native-env": "npm:~6.3.20" "@walmart/react-native-logger": "npm:1.35.0" @@ -7058,7 +7059,7 @@ __metadata: "@walmart/walmart-fiscal-week": "npm:^0.3.6" "@walmart/welcomeme-mini-app": "npm:0.96.0" "@walmart/wfm-ui": "npm:1.6.0" - "@walmart/wm-plus-mini-app": "npm:0.12.21" + "@walmart/wm-plus-mini-app": "npm:1.0.0" "@walmart/wmconnect-mini-app": "npm:2.6.0" adaptive-expressions: "npm:^4.13.5" adaptivecards-templating: "npm:^2.1.0" @@ -7571,6 +7572,17 @@ __metadata: languageName: node linkType: hard +"@walmart/react-native-cookies@npm:1.0.1": + version: 1.0.1 + resolution: "@walmart/react-native-cookies@npm:1.0.1" + dependencies: + invariant: "npm:^2.2.4" + peerDependencies: + react-native: ">= 0.60.2" + checksum: 10c0/f08d7cb9f2934f44a3312aadbffe08a0e8685aed96db7b7413041566a79927126491b98e973aed35675892c473c5df9f4350d95f909ee9779a527f8c81884f66 + languageName: node + linkType: hard + "@walmart/react-native-encrypted-storage@npm:~1.1.3": version: 1.1.18 resolution: "@walmart/react-native-encrypted-storage@npm:1.1.18" @@ -8188,9 +8200,9 @@ __metadata: languageName: node linkType: hard -"@walmart/wm-plus-mini-app@npm:0.12.21": - version: 0.12.21 - resolution: "@walmart/wm-plus-mini-app@npm:0.12.21" +"@walmart/wm-plus-mini-app@npm:1.0.0": + version: 1.0.0 + resolution: "@walmart/wm-plus-mini-app@npm:1.0.0" peerDependencies: "@react-navigation/native": ^6.0.0 "@react-navigation/stack": ^6.1.0 @@ -8198,7 +8210,7 @@ __metadata: "@walmart/gtp-shared-components": 2.0.10 react: ^18.1.0 react-native: ^0.70.5 - checksum: 10c0/0adffe409ed35f391eda8b8e3f849acdae6f7e91dfadba7aaa91e6d2781293f7aabc3fdac91938e64f7641cce99ca403a8a14fd908268d062837be321f75487f + checksum: 10c0/89c52ac673239f3e21b0aaee38a8c345133d6769c31441a5214746f63ecde136dfc285530574f7a16a3406121cafd173dd57f6485cd28989c7b725051c383b50 languageName: node linkType: hard
wplus version update
wplus version update
31ba87c876a68f5f11e7d9b2f1e7fe95d11c6d91
--- android/app/src/main/res/values/colors.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <color name="blue">#041e42</color> - <color name="black">#000000</color> </resources> --- android/app/src/main/res/values/styles.xml @@ -6,11 +6,10 @@ <item name="android:statusBarColor">@color/blue</item> <!-- Refer to https://github.com/facebook/react-native/pull/29452 --> <item name="android:editTextBackground">@drawable/rn_edit_text_material</item> - <item name="android:textColorPrimary">@color/black</item> </style> <style name="SplashTheme" parent="Theme.AppCompat.DayNight.NoActionBar"> - <item name="android:textColor">@color/black</item> + <item name="android:textColor">#000000</item> <item name="android:windowBackground">@drawable/background_splash</item> <item name="android:statusBarColor">@color/blue</item> </style> --- package-lock.json @@ -57,7 +57,7 @@ "@walmart/inbox-mini-app": "0.81.3", "@walmart/iteminfo-mini-app": "5.3.2", "@walmart/manager-approvals-miniapp": "0.1.2", - "@walmart/me-field-mini-app": "1.1.39", + "@walmart/me-field-mini-app": "1.1.40", "@walmart/metrics-mini-app": "0.9.38", "@walmart/mod-flex-mini-app": "1.3.15", "@walmart/moment-walmart": "1.0.4", @@ -5435,9 +5435,9 @@ } }, "node_modules/@walmart/me-field-mini-app": { - "version": "1.1.39", - "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-1.1.39.tgz", - "integrity": "sha512-Z0hU7q9UVd1RoBbxUj1jhYvFnCg/O0/4tB0PcC34TRQEkL+16qg4diJpy8zM9GVJgQG0a9loeSnGcmmza0RYQg==", + "version": "1.1.40", + "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-1.1.40.tgz", + "integrity": "sha512-TQnD27JmXKV5++VL7O4GYvqkcqZ/HAQWlpqxVynIJnidoB0lWJENs+OtaDIYdqEcQy1mdFZVDp2BvZHzMbpy+w==", "hasInstallScript": true, "peerDependencies": { "@atmt/feedback-component-native": "^8.0.0", @@ -5455,7 +5455,7 @@ "@walmart/core-services-allspark": "~1.10.11", "@walmart/core-utils": "1.0.10", "@walmart/functional-components": "^2.0.2", - "@walmart/gtp-shared-components": "^2.0.0", + "@walmart/gtp-shared-components": "^2.0.1", "@walmart/impersonation-mini-app": "1.10.0", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-logger": "^1.29.0", @@ -25251,9 +25251,9 @@ "integrity": "sha512-zOmvEEul9aMoJhNbE2Hz1FxxeXGovIwPojGjvjyhHBDcHTQGWHJVX5d2WpxgRk7M81jBnEzluDU5dJHK9bf3oQ==" }, "@walmart/me-field-mini-app": { - "version": "1.1.39", - "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-1.1.39.tgz", - "integrity": "sha512-Z0hU7q9UVd1RoBbxUj1jhYvFnCg/O0/4tB0PcC34TRQEkL+16qg4diJpy8zM9GVJgQG0a9loeSnGcmmza0RYQg==" + "version": "1.1.40", + "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-1.1.40.tgz", + "integrity": "sha512-TQnD27JmXKV5++VL7O4GYvqkcqZ/HAQWlpqxVynIJnidoB0lWJENs+OtaDIYdqEcQy1mdFZVDp2BvZHzMbpy+w==" }, "@walmart/metrics-mini-app": { "version": "0.9.38", --- package.json @@ -100,7 +100,7 @@ "@walmart/inbox-mini-app": "0.81.3", "@walmart/iteminfo-mini-app": "5.3.2", "@walmart/manager-approvals-miniapp": "0.1.2", - "@walmart/me-field-mini-app": "1.1.39", + "@walmart/me-field-mini-app": "1.1.40", "@walmart/metrics-mini-app": "0.9.38", "@walmart/mod-flex-mini-app": "1.3.15", "@walmart/moment-walmart": "1.0.4",
feat: :package: Bump learning mini app version to 1.1.40
feat: :package: Bump learning mini app version to 1.1.40
2caba600c339497e4f917c18711e9dd9ffa06f84
--- package-lock.json @@ -12789,9 +12789,9 @@ } }, "react-native-wm-barcode": { - "version": "2.25.0", - "resolved": "https://npme.walmart.com/react-native-wm-barcode/-/react-native-wm-barcode-2.25.0.tgz", - "integrity": "sha512-xmSBA8p4Zol8ANcEytrb3cGukmnVCbVqRzRFXKOcKH1LPMVn/wnWEQ0itu8x24k4/guMa/Mf8vagstrCjAnMGg==" + "version": "2.29.0", + "resolved": "https://npme.walmart.com/react-native-wm-barcode/-/react-native-wm-barcode-2.29.0.tgz", + "integrity": "sha512-xXs/c6oyhcDIqTxwVt+H9FegeYYNZ1fF5WfatNA/k9oSfUsbEGEALIxJNc/wJDnra51SeEAm+XAO9SI+mmjOCw==" }, "react-native-wm-config": { "version": "0.1.1", --- package.json @@ -130,7 +130,7 @@ "react-native-video": "^5.1.0-alpha8", "react-native-view-shot": "^3.1.2", "react-native-webview": "^10.7.0", - "react-native-wm-barcode": "2.25.0", + "react-native-wm-barcode": "2.29.0", "react-native-wm-config": "^0.1.1", "react-native-wm-network": "^0.1.0", "react-native-wm-notification": "^1.0.0",
updated scanner version
updated scanner version
6febda199d87ea4151b3759fdffec85f65aa55ea
--- .yarn/patches/@walmart-facilities-management-miniapp-npm-0.15.7-5b9d1150f9.patch @@ -1,5 +1,5 @@ diff --git a/dist/CoreComponent/hooks/useRequestPermissions.js b/dist/CoreComponent/hooks/useRequestPermissions.js -index 6e8d58a624318f1fcbe27c04bd3bcdc19a699197..64e2f23b7d94f7cb16e2b3900b1a731b8c89af46 100644 +index 6e8d58a624318f1fcbe27c04bd3bcdc19a699197..19ce5cd42ffb24c70a3e68edf5f4b8cd76676aeb 100644 --- a/dist/CoreComponent/hooks/useRequestPermissions.js +++ b/dist/CoreComponent/hooks/useRequestPermissions.js @@ -12,9 +12,11 @@ import { CAMERA_PERMISSIONS_STATUS_TYPES } from '../constants'; @@ -12,7 +12,7 @@ index 6e8d58a624318f1fcbe27c04bd3bcdc19a699197..64e2f23b7d94f7cb16e2b3900b1a731b - const getLocationPermissions = reactReduxSelector(LocationSelectors?.getPermissionStatus); + // const getLocationPermissions = reactReduxSelector(LocationSelectors?.getPermissionStatus); + // TODO - use AllsparkPermissionClient to directly check permission status -++ // const getLocationPermissions = reactReduxSelector(LocationSelectors?.getPermissionStatus); ++ // const getLocationPermissions = reactReduxSelector(LocationSelectors?.getPermissionStatus); const { permissions = [] } = props || {}; const [isDeviceLocationEnabled, setDeviceLocationState] = useState(null); const { dispatch } = AllsparkReduxStore; @@ -23,7 +23,7 @@ index 6e8d58a624318f1fcbe27c04bd3bcdc19a699197..64e2f23b7d94f7cb16e2b3900b1a731b - isGlobalPermissionGranted: getLocationPermissions, + // isGlobalPermissionGranted: getLocationPermissions, + // TODO- refactor, this is being used as a boolean below but value would've previously always have been a string. -+ // Setting to true which effctively should maintain previous behavior. ++ // Setting to true which effctively should maintain previous behavior. + isGlobalPermissionGranted: true, })); async function handleIsLocationEnabled() { --- yarn.lock @@ -6374,10 +6374,10 @@ __metadata: "@walmart/facilities-management-miniapp@patch:@walmart/facilities-management-miniapp@npm%3A0.15.7#~/.yarn/patches/@walmart-facilities-management-miniapp-npm-0.15.7-5b9d1150f9.patch": version: 0.15.7 - resolution: "@walmart/facilities-management-miniapp@patch:@walmart/facilities-management-miniapp@npm%3A0.15.7#~/.yarn/patches/@walmart-facilities-management-miniapp-npm-0.15.7-5b9d1150f9.patch::version=0.15.7&hash=faa979" + resolution: "@walmart/facilities-management-miniapp@patch:@walmart/facilities-management-miniapp@npm%3A0.15.7#~/.yarn/patches/@walmart-facilities-management-miniapp-npm-0.15.7-5b9d1150f9.patch::version=0.15.7&hash=89b02c" peerDependencies: "@walmart/allspark-foundation": "*" - checksum: 10c0/9f76b2aa7eaec3439b1518ce6b4441eeea7f9a71701f5a010c6a0cfa915cb8ea76144a1584374dd03a5a4f71182e7ff61f2dc953580ca18d6aa23eeb8643f9b2 + checksum: 10c0/7f52b95c21c9e07bb8b5dd483d5899d3c5a6d1cf7cf106af55fa021769b4487c484635988eac2962f93538092233575c9c9a3bb2f629ee82eec432c9f1903666 languageName: node linkType: hard
chore: update patch
chore: update patch
8725dddc060a1a274e712e9840072eede042164e
--- package.json @@ -87,8 +87,8 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.22.3", "@walmart/attendance-mini-app": "3.44.0", - "@walmart/avp-feature-app": "0.5.1", - "@walmart/avp-shared-library": "0.5.2", + "@walmart/avp-feature-app": "0.7.2", + "@walmart/avp-shared-library": "0.7.3", "@walmart/backroom-mini-app": "1.1.10", "@walmart/calling-mini-app": "0.2.38", "@walmart/checkout-mini-app": " 3.18.0", @@ -104,7 +104,7 @@ "@walmart/exception-mini-app": "1.8.3", "@walmart/facilities-management-miniapp": "0.11.7", "@walmart/feedback-all-spark-miniapp": "0.9.63", - "@walmart/financial-wellbeing-feature-app": "1.23.3", + "@walmart/financial-wellbeing-feature-app": "1.23.4", "@walmart/functional-components": "6.1.4", "@walmart/gta-react-native-calendars": "0.7.0", "@walmart/gtp-shared-components": "2.2.1", --- yarn.lock @@ -5700,24 +5700,24 @@ __metadata: languageName: node linkType: hard -"@walmart/avp-feature-app@npm:0.5.1": - version: 0.5.1 - resolution: "@walmart/avp-feature-app@npm:0.5.1" +"@walmart/avp-feature-app@npm:0.7.2": + version: 0.7.2 + resolution: "@walmart/avp-feature-app@npm:0.7.2" peerDependencies: - "@react-navigation/native": ^6.0.0 - "@react-navigation/stack": ^6.1.0 - "@walmart/core-services": ~2.0.11 - "@walmart/gtp-shared-components": ^2.0.0 - react: ^18.2.0 - react-native: ~0.70.5 - react-native-gesture-handler: ^2.13.1 - checksum: 10c0/40ec7c0d8293e5856b332e32ce02b0d3a4beea34c741a9d647f15707f71728ec08cc5e77afe8a93c7d70ab2eb69d51c857bb69322f2ffbec09ef4bad7f03f11f + "@react-navigation/native": ">=6.0.8" + "@react-navigation/stack": ">=6.1.1" + "@walmart/allspark-foundation": "*" + react: ">=18.2.0" + react-native: ">=0.72.10" + react-redux: ">=8.0.4" + redux: ">=4.2.1" + checksum: 10c0/a4c2e578d9225d9f0d0c57d47b82f7ee5821dbd0a9cbd1e273488d029f29d865b7accaceaf71a64f923e03edf6df28749cc893ba21964dc461a45cd3a36c46d5 languageName: node linkType: hard -"@walmart/avp-shared-library@npm:0.5.2": - version: 0.5.2 - resolution: "@walmart/avp-shared-library@npm:0.5.2" +"@walmart/avp-shared-library@npm:0.7.3": + version: 0.7.3 + resolution: "@walmart/avp-shared-library@npm:0.7.3" peerDependencies: axios: ^1.3.4 immer: ^9.0.16 @@ -5727,7 +5727,7 @@ __metadata: redux-saga: ^1.1.3 reduxsauce: ^1.2.0 reselect: ^4.1.7 - checksum: 10c0/954916f658f9fd375b4875d789f1a83c2d03f3411f5e1de81378a0a9c6260f1cda4616d61f7f912cd86e66f76e78314173cce842048cfedca104196fe5f83619 + checksum: 10c0/0ea6aa1ccc36e803747c2f79779b6009f1e1a597bb27daa7e3bf9ba677ec3b0e87a327153045848a569cf3564686fee51a7fe64bff7a1d1e53e20f15bd53fa77 languageName: node linkType: hard @@ -6144,20 +6144,18 @@ __metadata: languageName: node linkType: hard -"@walmart/financial-wellbeing-feature-app@npm:1.23.3": - version: 1.23.3 - resolution: "@walmart/financial-wellbeing-feature-app@npm:1.23.3" +"@walmart/financial-wellbeing-feature-app@npm:1.23.4": + version: 1.23.4 + resolution: "@walmart/financial-wellbeing-feature-app@npm:1.23.4" peerDependencies: - "@react-navigation/native": ^6.0.0 - "@react-navigation/stack": ^6.1.0 - "@walmart/core-services": ^1.0.3 - "@walmart/redux-store": ^2.0.4 - react: ^18.2.0 - react-native: ^0.70.4 - react-native-svg: ^13.4.0 - react-redux: ^8.0.4 - redux: ^4.1.2 - checksum: 10c0/fb211673fd301f24b6b933597baf2ab548c5bd01be3e337b258deda300e17c344dfaa19b8b4363699a70ce7a3ac0ce087bd4eb575a3aa8ec902d0a0cd2dbda46 + "@react-navigation/native": ">=6.0.8" + "@react-navigation/stack": ">=6.1.1" + "@walmart/allspark-foundation": "*" + react: ">=18.2.0" + react-native: ">=0.72.10" + react-redux: ">=8.0.4" + redux: ">=4.2.1" + checksum: 10c0/a4d6a05d81804b939166df95d03496437c5e3ac843868730f92fd03a084fa9a2cd2650b0061ef354dc1b7201530fd55aa7e42c7a02af59bba4c4dd69520a507c languageName: node linkType: hard @@ -7802,8 +7800,8 @@ __metadata: "@walmart/ask-sam-chat-components": "npm:^0.2.7" "@walmart/ask-sam-mini-app": "npm:1.22.3" "@walmart/attendance-mini-app": "npm:3.44.0" - "@walmart/avp-feature-app": "npm:0.5.1" - "@walmart/avp-shared-library": "npm:0.5.2" + "@walmart/avp-feature-app": "npm:0.7.2" + "@walmart/avp-shared-library": "npm:0.7.3" "@walmart/backroom-mini-app": "npm:1.1.10" "@walmart/calling-mini-app": "npm:0.2.38" "@walmart/checkout-mini-app": "npm: 3.18.0" @@ -7819,7 +7817,7 @@ __metadata: "@walmart/exception-mini-app": "npm:1.8.3" "@walmart/facilities-management-miniapp": "npm:0.11.7" "@walmart/feedback-all-spark-miniapp": "npm:0.9.63" - "@walmart/financial-wellbeing-feature-app": "npm:1.23.3" + "@walmart/financial-wellbeing-feature-app": "npm:1.23.4" "@walmart/functional-components": "npm:6.1.4" "@walmart/gta-react-native-calendars": "npm:0.7.0" "@walmart/gtp-shared-components": "npm:2.2.1"
bumped avp & fwb versions
bumped avp & fwb versions
5aef4750695ff1dcc6dac6e5fa31a2c1b325cdcf
--- packages/allspark-foundation/src/Core/docs/WhatsChanging.md @@ -0,0 +1,40 @@ +# Allspark Foundation, What Changing? + +The Allspark Foundation will introduce several large architectural changes for the Me@Walmart platform. Our overall goals are to unify, simplify, and standardize the libraries teams use to build container and mini apps. + +With all the changes below keep in mind that backwards compatability is our goal during the initial introduction of the Foundation. Deprecated packages map to their new foundation counterparts. Refactored features maintain legacy behavior, methods, etc. In each case, these things should be marked as deprecated and point to what you should use instead. + +## Deprecated Packages + +The following packages are being replaced by `@walmart/allspark-foundation`. + +@walmart/allspark-graphql-client +@walmart/allspark-http-client +@walmart/core-services +@walmart/core-utils +@walmart/functional-components +@walmart/react-native-env +@walmart/react-native-shared-navigation +@walmart/react-native-wm-network +@walmart/react-native-wm-notification +@walmart/react-native-wm-telemetry +@walmart/redux-store + +We are not removing their functionality, but rather moving them to the new package. This will allow us to better manage the dependencies and reduce the number of packages we need to maintain. + +### Refactored Features + +The following features have had their underlying implementation changed: + +Banners, now uses AllsparkBanners which is a DynamicComponent +Drawer Button, now uses DrawerButton from foundation, context functionality moved to AllsparkNavigationClient +Drawer Badge, now uses AllsparkBadges which is a DynamicComponent + +The following core services are no longer dynamic. Meaning their implementation doesnt change per container. They each have a static implementation defined in the foundation: + +HTTP -> axios +Network -> @react-native-community/netinfo +Notification -> @walmart/react-native-sumo-sdk +Permissions -> react-native-permissions +Scanner -> @walmart/react-native-scanner-3.0 +Translation -> i18next
docs: added intial whats changing doc
docs: added intial whats changing doc
c4c9560340cfeb42e6330f726f4b1b2e25a53071
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.12.1-alpha.2", + "version": "2.12.1-alpha.3", "main": "dist/index.js", "files": [ "dist" @@ -104,7 +104,7 @@ "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "6.1.4", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "2.8.0-alpha.3", + "@walmart/wmconnect-mini-app": "2.8.0-alpha.6", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", --- yarn.lock @@ -6373,7 +6373,7 @@ __metadata: "@walmart/react-native-sumo-sdk": "npm:2.6.0" "@walmart/redux-store": "npm:6.1.4" "@walmart/ui-components": "npm:1.15.1" - "@walmart/wmconnect-mini-app": "npm:2.8.0-alpha.3" + "@walmart/wmconnect-mini-app": "npm:2.8.0-alpha.6" babel-jest: "npm:^29.2.1" chance: "npm:^1.1.11" eslint: "npm:8.22.0" @@ -6506,9 +6506,9 @@ __metadata: languageName: node linkType: hard -"@walmart/wmconnect-mini-app@npm:2.8.0-alpha.3": - version: 2.8.0-alpha.3 - resolution: "@walmart/wmconnect-mini-app@npm:2.8.0-alpha.3" +"@walmart/wmconnect-mini-app@npm:2.8.0-alpha.6": + version: 2.8.0-alpha.6 + resolution: "@walmart/wmconnect-mini-app@npm:2.8.0-alpha.6" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6548,7 +6548,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/0d9d8fd2e96c135e23196af1db4e408cb879ffb265536ed69de053cebfbd816da65d813dc2c318d21edef32ffc0eeeaa51bacd4b26b2942891cff788275d924b + checksum: 10c0/e03fc87a25ffa31e45cac58e6898175f7296fef0667b24c2bb94fe6aae59cd729ff8c42592473deb51d68c4412f0efba2c66d87b7a63a406bf4c005e7ac3d257 languageName: node linkType: hard
update the shared files
update the shared files
f8b4771f84cb5fddabb1e6dd32a9037e7ae17670
--- packages/allspark-foundation-hub/src/HubFeature/Shared/Components/ActionButtonGroup/ActionButtonGroup.tsx @@ -3,6 +3,8 @@ import { ButtonGroupProps } from './types'; import { Button } from '@walmart/gtp-shared-components'; import { buttonGroupStyles as styles } from './style'; import { View } from 'react-native'; +import { useSelector } from 'react-redux'; +import { cancelActionButtonEnabled } from '../../../SupplyChain/Redux'; export const ActionButtonGroup = ({ secondaryButtonLabel, @@ -10,9 +12,10 @@ export const ActionButtonGroup = ({ onSecondaryButtonPress, onPrimaryButtonPress, }: ButtonGroupProps) => { + const showCancelButton = useSelector(cancelActionButtonEnabled); return ( <View style={styles.buttonContainer}> - {secondaryButtonLabel && onSecondaryButtonPress && ( + {secondaryButtonLabel && onSecondaryButtonPress && showCancelButton && ( <Button variant='tertiary' size='small' --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Components/EditSavedTeams/EditSavedTeams.tsx @@ -8,6 +8,8 @@ import { View } from 'react-native'; import { Images } from '../../Images/images'; import { useAllsparkTranslation } from '@walmart/allspark-foundation'; import mockData from './mock'; +import { useSelector } from 'react-redux'; +import { editSavedTeamsEnabled } from '../../Redux'; type SavedTeam = { teamId: string; @@ -33,6 +35,7 @@ const renderSavedTeamItem: ListRenderItem<SavedTeam> = ({ }; const EditSavedTeams = ({ handleEdit }: { handleEdit: () => void }) => { + const showEditSavedTeams = useSelector(editSavedTeamsEnabled); const { bottom: bottomInset } = useSafeAreaInsets(); const divider = () => <View style={styles.divider} />; const { t } = useAllsparkTranslation(); @@ -41,9 +44,9 @@ const EditSavedTeams = ({ handleEdit }: { handleEdit: () => void }) => { <RosterPageHeader title={t('editSavedTeams.title')} subText={t('editSavedTeams.subText')} - rightTextLink - textLinkLabel='Edit' - onPressRightTextLink={handleEdit} + rightTextLink={showEditSavedTeams} + textLinkLabel={showEditSavedTeams ? 'Edit' : undefined} + onPressRightTextLink={showEditSavedTeams ? handleEdit : undefined} /> <FlashList ListHeaderComponent={() => ( --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Components/ExpandedTeamShift/ExpandedTeamShift.tsx @@ -9,7 +9,10 @@ import { colors, Divider } from '@walmart/gtp-shared-components'; import { useAllsparkTranslation } from '@walmart/allspark-foundation'; import { ActionButtonGroup } from '../../../Shared/Components/ActionButtonGroup'; import { FEATURE_ID } from '../../constant'; +import { useSelector } from 'react-redux'; +import { teamSearchInputEnabled } from '../../Redux'; export const ExpandedTeamShift = () => { + const showTeamSearchInput = useSelector(teamSearchInputEnabled); const { t } = useAllsparkTranslation(FEATURE_ID); //TODO: Remove dummy data const shiftdata = [ @@ -60,7 +63,7 @@ export const ExpandedTeamShift = () => { backgroundColor={colors.white} textColor={colors.black} /> - <TeamSearchInput handleChange={() => {}} /> + {showTeamSearchInput && <TeamSearchInput handleChange={() => {}} />} <EditSavedTeams handleEdit={() => {}} /> <Divider UNSAFE_style={styles.divider} /> <HubHeader
feat: ff for action buttons edit button and search input
feat: ff for action buttons edit button and search input
e15c7129b39f8fbbc76fb0cb21981ba25b85fda0
--- packages/allspark-foundation/__tests__/Work/client.test.ts @@ -1,4 +1,4 @@ -import { ActiveAllsparkContainer } from '../../src/Container/ActiveContainerManager'; +import { ActiveAllsparkContainer } from '../../src/Container'; import { AllsparkReduxStore } from '../../src/Redux'; import { WorkActionsCreators, WorkflowErrors } from '../../src/Work'; import { WorkClient } from '../../src/Work/client'; @@ -9,6 +9,14 @@ jest.mock('redux-saga/effects', () => ({ cancelled: () => mockCancelled(), })); +jest.mock('../../src/Container', () => ({ + ActiveAllsparkContainer: { + features: { + getFeatureEnabled: jest.fn(), + }, + }, +})); + describe('WorkClient', () => { let workClient: WorkClient<any, any>; let mockDispatch; --- packages/allspark-foundation/src/Work/client.ts @@ -1,7 +1,7 @@ import { Task } from 'redux-saga'; import { cancelled } from 'redux-saga/effects'; import { AllsparkReduxStore } from '../Redux'; -import { ActiveAllsparkContainer } from '../Container/ActiveContainerManager'; +import { ActiveAllsparkContainer } from '../Container'; import { WorkActionsCreators, WorkActionTypes } from './redux'; import { BaseWorkflows,
chore(work): fix work client import reference
chore(work): fix work client import reference
29adce79297e8720edf4dcb840d113e721384413
--- src/channels/components/ChannelRow.tsx @@ -17,9 +17,9 @@ import { } from '@walmart/gtp-shared-components'; import Animated, {FadeIn} from 'react-native-reanimated'; -import {useChannelDetails} from '../channels'; -import {TextingNavParamsMap} from '../navigation/types'; -import {PresenceIndicator} from '../presence'; +import {useChannelDetails} from '..'; +import {TextingNavParamsMap} from '../../navigation/types'; +import {PresenceIndicator} from '../../presence'; const styles = StyleSheet.create({ item: { --- src/channels/components/index.ts @@ -0,0 +1,2 @@ +export * from './ChannelRow'; +export * from './UnreadBadge'; --- src/channels/index.ts @@ -1,4 +1,4 @@ export * from './hooks'; export * from './provider'; export * from './types'; -export * from './components/UnreadBadge'; +export * from './components'; --- src/presence/hooks.ts @@ -4,12 +4,11 @@ import {PresenceContext} from './context'; import {UserPresence} from './types'; export const usePresenceContext = () => { - const context = useContext(PresenceContext); - return context; + return useContext(PresenceContext); }; export const useUserPresence = (userId: string, live: boolean) => { - const presence = useContext(PresenceContext); + const presence = usePresenceContext(); const data = presence.byId[userId]; useEffect(() => { --- src/screens/ChannelsScreen.tsx @@ -2,12 +2,11 @@ import React from 'react'; import {FlatList, ListRenderItem, StyleSheet} from 'react-native'; import {SafeAreaView} from 'react-native-safe-area-context'; import {StackNavigationProp} from '@react-navigation/stack'; +import {useFocusEffect} from '@react-navigation/native'; import {Button, ChatBubbleIcon} from '@walmart/gtp-shared-components'; import {TextingNavParamsMap} from '../navigation/types'; -import {ChannelRow} from '../containers/ChannelRow'; -import {useChannelLastMessageContext, useChannelContext} from '../channels'; -import {useFocusEffect} from '@react-navigation/native'; +import {ChannelRow, useChannelContext} from '../channels'; const styles = StyleSheet.create({ list: {margin: 16, marginTop: 0, paddingTop: 16}, --- src/channels/components/ChannelRow.tsx @@ -17,9 +17,9 @@ import { } from '@walmart/gtp-shared-components'; import Animated, {FadeIn} from 'react-native-reanimated'; -import {useChannelDetails} from '../channels'; -import {TextingNavParamsMap} from '../navigation/types'; -import {PresenceIndicator} from '../presence'; +import {useChannelDetails} from '..'; +import {TextingNavParamsMap} from '../../navigation/types'; +import {PresenceIndicator} from '../../presence'; const styles = StyleSheet.create({ item: { --- src/channels/components/index.ts @@ -0,0 +1,2 @@ +export * from './ChannelRow'; +export * from './UnreadBadge'; --- src/channels/index.ts @@ -1,4 +1,4 @@ export * from './hooks'; export * from './provider'; export * from './types'; -export * from './components/UnreadBadge'; +export * from './components'; --- src/presence/hooks.ts @@ -4,12 +4,11 @@ import {PresenceContext} from './context'; import {UserPresence} from './types'; export const usePresenceContext = () => { - const context = useContext(PresenceContext); - return context; + return useContext(PresenceContext); }; export const useUserPresence = (userId: string, live: boolean) => { - const presence = useContext(PresenceContext); + const presence = usePresenceContext(); const data = presence.byId[userId]; useEffect(() => { --- src/screens/ChannelsScreen.tsx @@ -2,12 +2,11 @@ import React from 'react'; import {FlatList, ListRenderItem, StyleSheet} from 'react-native'; import {SafeAreaView} from 'react-native-safe-area-context'; import {StackNavigationProp} from '@react-navigation/stack'; +import {useFocusEffect} from '@react-navigation/native'; import {Button, ChatBubbleIcon} from '@walmart/gtp-shared-components'; import {TextingNavParamsMap} from '../navigation/types'; -import {ChannelRow} from '../containers/ChannelRow'; -import {useChannelLastMessageContext, useChannelContext} from '../channels'; -import {useFocusEffect} from '@react-navigation/native'; +import {ChannelRow, useChannelContext} from '../channels'; const styles = StyleSheet.create({ list: {margin: 16, marginTop: 0, paddingTop: 16},
refactor: move channel row to channels components folder
refactor: move channel row to channels components folder
52265c9c1f87d68f4b348fe954e7bc2134acc8e0
--- .looper.multibranch.yml @@ -93,7 +93,6 @@ flows: - foreachParallelFailsafe($ENV): - tools(android = ${ANDROID_TOOLS}): - group("Android Build ${value}"): - - (name Hello world with ruler) echo "Hello world with ruler" - (name Bundle Setup) https_proxy=http://sysproxy.wal-mart.com:8080 http_proxy=http://sysproxy.wal-mart.com:8080 $RUBY_PATH/bundle - (name Bundle Update) https_proxy=http://sysproxy.wal-mart.com:8080 http_proxy=http://sysproxy.wal-mart.com:8080 $RUBY_PATH/bundle update - declare(start_time) @@ -106,7 +105,8 @@ flows: build-android-app: - (name Build Android) export EXPO_PUBLIC_APP_VARIANT="${ENV}" && export FASTLANE_DISABLE_COLORS=1 && $RUBY_PATH/bundle exec fastlane build_android # set GRADLE_BUILD_FLAVOUR as Capitalized Env - - (name Analyze Android Bundle Size) export FASTLANE_DISABLE_COLORS=1 && $RUBY_PATH/bundle exec fastlane analyze_android_bundle_size + - (name Analyze Android App Bundle) export FASTLANE_DISABLE_COLORS=1 && $RUBY_PATH/bundle exec fastlane analyze_android_bundle_size + - (name Log Android App Size) export FASTLANE_DISABLE_COLORS=1 && $RUBY_PATH/bundle exec fastlane log_android_appsize build-app: # overridden to remove setting gradle build flavor, no longer needed
feat(ruler): allspark-6443 added a new stage for logging android app size and removed test step
feat(ruler): allspark-6443 added a new stage for logging android app size and removed test step
8abd44ea47f722eb97de86377702e6a7a2ca3ae0
--- packages/allspark-foundation/src/Components/Onboarding/TeamSelection/Component/TeamSelectionList.tsx @@ -15,6 +15,7 @@ import { } from '../Constants/TeamSelectionConstants'; import { createSections } from '../Utils/sectionListData'; import { SelectionBannerFooterButtons } from './SelectionBannerFooterButtons'; +import { useUpsertManagerExperiencePreferenceMutation } from '@walmart/me-at-walmart-athena-queries'; export const TeamSelectionList = ({ areas, @@ -24,8 +25,6 @@ export const TeamSelectionList = ({ userType, handleSelectSingle, handleSelectAll, - handleCancelButton, - handleSaveButton, }: TeamSelectionListProps) => { const allAvailableTeams: Team[] = useMemo( () => @@ -41,6 +40,36 @@ export const TeamSelectionList = ({ const sections = createSections(myArea, areas, areaTeamMap); + const [upsertManagerExperiencePreferenceMutation] = + useUpsertManagerExperiencePreferenceMutation({ + onCompleted: (data) => { + console.log('data', data); + }, + onError: (error) => { + console.log('error', error); + }, + }); + + const handleCancelButton = () => { + console.log('Cancel button clicked'); + }; + const handleSaveButton = () => { + console.log('Cancel button clicked'); + upsertManagerExperiencePreferenceMutation({ + variables: { + win: '111111111', + site: 100, + teams: [ + { + teamId: '888', + site: '100', + countryCode: 'US', + }, + ], + }, + }); + }; + return ( //TODO: Add translations to all constants <View testID='selectionList'> --- packages/allspark-foundation/src/Components/Onboarding/TeamSelection/Screens/TeamSelection.tsx @@ -1,12 +1,9 @@ import React, { useState, useMemo } from 'react'; -import { Area, Team as TeamName, TeamSelectionProps } from '../types'; +import { Area, Team as TeamName } from '../types'; import { TeamSelectionList } from '../Component/TeamSelectionList'; import { areaTeamMap } from '../mockData'; -export const TeamSelection = ({ - handleCancel, - handleSave, -}: TeamSelectionProps) => { +export const TeamSelection = () => { // TODO: areas, myArea and primaryTeam come from API const areas: Area[] | [] = useMemo( () => [ @@ -23,6 +20,7 @@ export const TeamSelection = ({ ], [] ); + const myArea: Area = useMemo(() => 'Management', []); const primaryTeam: TeamName = useMemo(() => 'Management', []); const allAvailableTeams: TeamName[] = useMemo( @@ -63,8 +61,6 @@ export const TeamSelection = ({ userType='salariedAssociate' handleSelectSingle={handleSelectSingle} handleSelectAll={handleSelectAll} - handleCancelButton={handleCancel} - handleSaveButton={handleSave} /> ); }; --- packages/allspark-foundation/src/Components/Onboarding/TeamSelection/types.ts @@ -36,8 +36,8 @@ export type Area = | 'Vision Center'; export interface TeamSelectionProps { - handleCancel: () => void; - handleSave: () => void; + // handleCancel: () => void; + // handleSave: () => void; } export interface TeamSelectionListItemProps { teamName: Team; @@ -67,8 +67,8 @@ export interface TeamSelectionListProps { userType: UserType; handleSelectSingle: (teamName: Team) => void; handleSelectAll: () => void; - handleCancelButton: () => void; - handleSaveButton: () => void; + // handleCancelButton: () => void; + // handleSaveButton: () => void; } export interface ListHeaderProps {
Adding upsertQuery
Adding upsertQuery
aaa98824df0c23c906f78f56bc365a896e2a2782
--- __tests__/core/analyticsInitTest.ts @@ -1,5 +1,7 @@ +import {all, takeLatest, call} from 'redux-saga/effects'; + jest.mock('@walmart/redux-store', () => ({ - getStore: jest.fn(), + addSagas: jest.fn(), })); jest.mock('react-native-wm-telemetry', () => ({ @@ -25,12 +27,17 @@ jest.mock('@react-native-community/netinfo', () => ({ }, })); +jest.mock('../../src/core/wmConfigInit', () => ({ + initWmConfig: jest.fn(), +})); + import { - initAnalyticsUserAttributes, + onUserChanged, initCrashAttributes, + analyticsSagas, } from '../../src/core/analyticsInit'; -import {getStore} from '@walmart/redux-store'; +import type {User} from '@walmart/redux-store'; import WmTelemetry from 'react-native-wm-telemetry'; import NetInfo, { NetInfoStateType, @@ -42,65 +49,48 @@ import type { NetInfoChangeHandler, NetInfoUnknownState, } from '@react-native-community/netinfo'; +import {initWmConfig} from '../../src/core/wmConfigInit'; -describe('initAnalyticsUserAttributes', () => { - it('sets a listener on the redux store for the user', () => { - let onAction: () => void = () => {}; - const mockGetStore = getStore as jest.Mock; - const mockSubscribe = jest.fn((fn: () => void) => { - onAction = fn; - }); - const mockGetState = jest.fn(); - - mockGetStore.mockReturnValue({ - subscribe: mockSubscribe, - getState: mockGetState, - }); - - initAnalyticsUserAttributes(); - expect(mockSubscribe).toHaveBeenCalled(); - expect(onAction).toBeDefined(); - - // no user yet - mockGetState.mockReturnValue({ - user: null, - }); - onAction(); - expect(WmTelemetry.setUserId).not.toHaveBeenCalled(); - expect(WmTelemetry.setUserProperties).not.toHaveBeenCalled(); - - // now set a user - const userState = { - data: { - userId: 'test123', - countryCode: 'US', - division: '1', - regionNumber: 42, - siteId: 321, - employeeType: 'h', - domain: 'store', - }, - }; - mockGetState.mockReturnValue({ - user: userState, - }); - onAction(); - expect(WmTelemetry.setUserId).toHaveBeenCalledWith(userState.data.userId); - expect(WmTelemetry.setUserProperties).toHaveBeenCalledWith({ +describe('onUserChanged', () => { + it('sets user attributes', () => { + const user: User = { countryCode: 'US', division: '1', - regionNbr: '42', - site: '321', - employeeType: 'h', - domain: 'store', - }); + domain: 'test', + employeeType: 's', + fullTimePartTime: 'f', + userId: 'testUser', + win: '1235', + regionNumber: '99', + siteId: '123', + }; + + const iterator = onUserChanged({payload: user, type: ''}); + expect(iterator.next().value).toEqual( + call(WmTelemetry.setUserId, user.userId), + ); + expect(iterator.next().value).toEqual( + call(WmTelemetry.setUserProperties, { + countryCode: user.countryCode, + division: user.division, + regionNbr: user.regionNumber, + site: user.siteId, + employeeType: user.employeeType, + domain: user.domain, + }), + ); + expect(iterator.next().value).toEqual(call(initWmConfig)); + expect(iterator.next().done).toEqual(true); + }); +}); - // now repeat user; functions should not be invoked again if user didn't change - (WmTelemetry.setUserId as jest.Mock).mockClear(); - (WmTelemetry.setUserProperties as jest.Mock).mockClear(); - onAction(); - expect(WmTelemetry.setUserId).not.toHaveBeenCalled(); - expect(WmTelemetry.setUserProperties).not.toHaveBeenCalled(); +describe('analyticsSagas', () => { + it('sets up a watcher for sign in success', () => { + const iterator = analyticsSagas(); + expect(iterator.next().value).toEqual( + all([takeLatest('global/SIGN_IN_SUCCESS', onUserChanged)]), + ); + expect(iterator.next().done).toEqual(true); }); }); --- src/core/RootContainer.tsx @@ -9,30 +9,24 @@ import {navContainerProps} from '@walmart/react-native-shared-navigation'; import {AuthenticatorView, connectedSSO} from '../auth'; import './envInit'; import './screenTracker'; -import { - initAnalyticsUserAttributes, - initCrashAttributes, -} from './analyticsInit'; +import {initCrashAttributes} from './analyticsInit'; import {initSumoNotification} from './notificationInit'; import './httpClientInit'; import './storeConfigInit'; import {initI18n} from './i18nInit'; import {initAppConfig} from './appConfigInit'; import {initAppVersions} from './versionsInit'; -import {initWmConfig} from './wmConfigInit'; import {RootNav} from '../navigation'; import Config from '../../env'; import {Components} from '@walmart/push-to-talk-mini-app'; -initAnalyticsUserAttributes(); initCrashAttributes(); initSumoNotification(); initI18n(); initAppConfig(); initAppVersions(); -initWmConfig(); export const RootContainer = () => { useLayoutEffect(() => SplashScreen.hide(), []); --- src/core/analyticsInit.ts @@ -1,3 +1,4 @@ +import {all, takeLatest, call} from 'redux-saga/effects'; import NetInfo, { NetInfoState, NetInfoStateType, @@ -5,29 +6,30 @@ import NetInfo, { NetInfoCellularState, } from '@react-native-community/netinfo'; import WmTelemetry from 'react-native-wm-telemetry'; -import {getStore} from '@walmart/redux-store'; -import {SSOUser} from '@walmart/redux-store/lib/typescript/src/types/ssoPingFedTypes'; +import {addSagas, User} from '@walmart/redux-store'; +import {initWmConfig} from './wmConfigInit'; -let prevUser: SSOUser; +export function* onUserChanged(action: {payload: User; type: string}) { + const {payload: userData} = action; -export const initAnalyticsUserAttributes = () => { - getStore().subscribe(() => { - const userData = getStore().getState().user?.data; - if (userData && userData !== prevUser) { - WmTelemetry.setUserId(userData.userId); - WmTelemetry.setUserProperties({ - countryCode: userData.countryCode, - division: userData.division, - regionNbr: userData.regionNumber + '', - site: userData.siteId + '', - employeeType: userData.employeeType, - domain: userData.domain, - }); - - prevUser = userData; - } + yield call(WmTelemetry.setUserId, userData.userId); + yield call(WmTelemetry.setUserProperties, { + countryCode: userData.countryCode, + division: userData.division, + regionNbr: userData.regionNumber + '', + site: userData.siteId + '', + employeeType: userData.employeeType, + domain: userData.domain, }); -}; + + yield call(initWmConfig); +} + +export function* analyticsSagas() { + yield all([takeLatest('global/SIGN_IN_SUCCESS', onUserChanged)]); +} + +addSagas(analyticsSagas); type CrashAttributes = { connectionType: string;
calling remote config init after analytics has set user properties (#119)
calling remote config init after analytics has set user properties (#119)
28e1a131d1af2778259fd1960f4416de47f39c55
--- packages/me-at-walmart-container/src/types/config-components.d.ts @@ -32,7 +32,7 @@ declare module '@walmart/config-components' { [key: string]: string; }; logger: LoggerInstance; - httpClient: HttpClient; + httpClient: HttpClientInstance; } export type AppConfigParams = {
chore: lint fix
chore: lint fix
0d66b637e06850b2a1697853a5650c51ddaa4d26
--- packages/allspark-foundation-hub/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.1](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.4.0...@walmart/allspark-foundation-hub@1.4.1) (2025-03-03) + +### Bug Fixes + +- team switcher issue fix ([97bd98b](https://gecgithub01.walmart.com/allspark/allspark/commit/97bd98b196efce8ef623e3c5b5d7f3d19359c415)) + # [1.4.0](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.3.4...@walmart/allspark-foundation-hub@1.4.0) (2025-02-28) ### Features --- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.4.0", + "version": "1.4.1", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", --- packages/expo-config-plugins/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.1.1](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/expo-config-plugins@0.1.0...@walmart/expo-config-plugins@0.1.1) (2025-03-03) + +**Note:** Version bump only for package @walmart/expo-config-plugins + # 0.1.0 (2025-03-03) ### Features --- packages/expo-config-plugins/package.json @@ -1,7 +1,7 @@ { "name": "@walmart/expo-config-plugins", "packageManager": "yarn@4.1.1", - "version": "0.1.0", + "version": "0.1.1", "description": "Expo config plugins for me@apps", "main": "lib/index.js", "types": "lib/index.d.ts",
chore(version): updating package version
chore(version): updating package version - @walmart/allspark-foundation-hub@1.4.1 - @walmart/expo-config-plugins@0.1.1
1ad40a238b9f80dd2e271e6371ca940dbf076798
--- package-lock.json @@ -29418,7 +29418,7 @@ "requires": { "mv": "~2", "safe-json-stringify": "~1", - "uuid": "^3.3.2" + "uuid": "^8.0.0" } }, "@expo/cli": { @@ -30108,7 +30108,7 @@ "md5": "^2.2.1", "node-fetch": "^2.6.1", "remove-trailing-slash": "^0.1.0", - "uuid": "^3.3.2" + "uuid": "^8.3.2" } }, "@expo/sdk-runtime-versions": {
fix package lock update
fix package lock update
243ae005686fec629fb44bcd821d3f3ad596b87c
--- package.json @@ -63,7 +63,7 @@ "@redux-saga/testing-utils": "^1.1.3", "@sharcoux/slider": "^5.2.1", "@terrylinla/react-native-sketch-canvas": "^0.8.0", - "@walmart/shelfavailability-mini-app": "0.3.46", + "@walmart/shelfavailability-mini-app": "0.3.47", "@walmart/allspark-health-survey-mini-app": "0.0.41", "@walmart/allspark-home-mini-app": "0.4.0", "@walmart/allspark-me-mini-app": "0.1.0", @@ -88,7 +88,7 @@ "@walmart/schedule-mini-app": "0.2.76", "@walmart/settings-mini-app": "1.2.3", "@walmart/time-clock-mini-app": "0.3.4", - "@walmart/ui-components": "1.1.34", + "@walmart/ui-components": "1.1.35", "@walmart/welcomeme-mini-app": "0.24.2", "@walmart/wfm-ui": "^0.1.50", "axios-cache-adapter": "2.7.3",
Update package.json
Update package.json update Shelf Availability version and ui components version
bf594aee1334b635a62522a07172b3508db5b8be
--- packages/allspark-foundation-hub/__tests__/TeamOnboarding/TeamSelectionList.test.tsx @@ -52,6 +52,7 @@ jest.mock('../../src/Store/Redux', () => ({ userTeamSelectionFailed: jest.fn(), userOnboardingFailed: jest.fn(), updateSelectedTeamPreference: jest.fn(), + updateSelectedTeamIDs: jest.fn(), }, StoreManagerExperienceSelectors: { getUserIsAlreadyOnboarded: jest.fn(),
test(ui): fixed broken test cases
test(ui): fixed broken test cases
a6315b3bef0b7012570b212aed4e8c48e2694012
--- packages/me-at-walmart-container/src/setup.ts @@ -55,6 +55,7 @@ export const MeAtWalmartSetupHook = () => { authInfoSub.remove(); authErrorSub.remove(); }; + // eslint-disable-next-line react-hooks/exhaustive-deps }, []); // --- Screen Change Telemetry --- //
chore: fix lint errors
chore: fix lint errors
23316c8b712c923416ebf4aee9e86b06985ef109
--- src/managerExperience/screens/AllTeamsScreen/AllTeamsScreen.tsx @@ -50,7 +50,8 @@ export const AllTeamsScreen = () => { const isErrorFetchingTeams = (!allTeams || !allTeams.every((team) => team !== null)) && error; - const siteIsDC = useSelector(SiteSelectors.getWorkingSiteIsDC); + // Todo: Reach out to Core team and update the DC check for the user (SMDV: ####) + const siteIsDC = useSelector(SiteSelectors.getWorkingSiteIsDC); const userDomain = useSelector(UserSelectors.getDomain) const userIsDC = userDomain === 'distribution center';
comment added
comment added
a45fb375380ec9e93120d03caf09addef71a7566
--- package.json @@ -90,7 +90,7 @@ "@walmart/exception-mini-app": "1.0.16", "@walmart/facilities-management-miniapp": "0.5.22", "@walmart/feedback-all-spark-miniapp": "0.9.10", - "@walmart/financial-wellbeing-feature-app": "1.1.2", + "@walmart/financial-wellbeing-feature-app": "1.3.0", "@walmart/functional-components": "2.0.6", "@walmart/gta-react-native-calendars": "0.0.15", "@walmart/gtp-shared-components": "2.0.3",
bumped finanial-wellbeing-feature-app to 1.3.0
bumped finanial-wellbeing-feature-app to 1.3.0
d2ac6c0688bbe39d55b1e8730d1a1bbb6ff1c8c2
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.41.0", + "version": "1.42.0", "main": "dist/index.js", "files": [ "dist" @@ -81,7 +81,7 @@ "@typescript-eslint/parser": "^5.37.0", "@walmart/allspark-authentication": "6.1.4", "@walmart/allspark-foundation": "6.20.0", - "@walmart/allspark-foundation-hub": "1.3.10", + "@walmart/allspark-foundation-hub": "1.3.11", "@walmart/allspark-graphql-client": "^1.4.6", "@walmart/allspark-http-client": "6.1.4", "@walmart/config-components": "4.4.0", @@ -99,7 +99,7 @@ "@walmart/react-native-shared-navigation": "6.1.4", "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "3.7.0", - "@walmart/roster-mini-app": "2.43.0", + "@walmart/roster-mini-app": "2.44.0", "@walmart/ui-components": "1.15.1", "babel-jest": "^29.2.1", "chance": "^1.1.11", --- yarn.lock @@ -5992,9 +5992,9 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-foundation-hub@npm:1.3.10": - version: 1.3.10 - resolution: "@walmart/allspark-foundation-hub@npm:1.3.10" +"@walmart/allspark-foundation-hub@npm:1.3.11": + version: 1.3.11 + resolution: "@walmart/allspark-foundation-hub@npm:1.3.11" dependencies: "@reduxjs/toolkit": "npm:^1.9.7" "@shopify/flash-list": "npm:~1.6.4" @@ -6010,7 +6010,7 @@ __metadata: react: "*" react-native: "*" react-native-safe-area-context: 4.x - checksum: 10c0/67df40b876fc424f1db4c0f470e9bdeefce2a1de0d2bcb5e94e5a341e3069cb3af1226ea568fd9a9ec73c148c11f898e9df2a6809903e0a4eee82ea16705d229 + checksum: 10c0/87a495903b451745e7ef8a8403580eeacccbec4edb52de26af011841c5e0c845e26eca15aefb0cd10b8838fb091f48c5581cf8ce73934e33b5fbc3f830c820c9 languageName: node linkType: hard @@ -6398,7 +6398,7 @@ __metadata: "@typescript-eslint/parser": "npm:^5.37.0" "@walmart/allspark-authentication": "npm:6.1.4" "@walmart/allspark-foundation": "npm:6.20.0" - "@walmart/allspark-foundation-hub": "npm:1.3.10" + "@walmart/allspark-foundation-hub": "npm:1.3.11" "@walmart/allspark-graphql-client": "npm:^1.4.6" "@walmart/allspark-http-client": "npm:6.1.4" "@walmart/config-components": "npm:4.4.0" @@ -6416,7 +6416,7 @@ __metadata: "@walmart/react-native-shared-navigation": "npm:6.1.4" "@walmart/react-native-sumo-sdk": "npm:2.6.0" "@walmart/redux-store": "npm:3.7.0" - "@walmart/roster-mini-app": "npm:2.43.0" + "@walmart/roster-mini-app": "npm:2.44.0" "@walmart/ui-components": "npm:1.15.1" babel-jest: "npm:^29.2.1" chance: "npm:^1.1.11" @@ -6597,9 +6597,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:2.43.0": - version: 2.43.0 - resolution: "@walmart/roster-mini-app@npm:2.43.0" +"@walmart/roster-mini-app@npm:2.44.0": + version: 2.44.0 + resolution: "@walmart/roster-mini-app@npm:2.44.0" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6641,7 +6641,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/dac73381c2ce48200f12a1a4475f3b32dce6f4e115152b6c2340a34e5fff3c8013e2f3d56cd2a0e98d21ed9db315e7bfce9848f3e343f210523d3e332f57471e + checksum: 10c0/c9098736a54df5b7d086376a02545341bb225d86bd66cc1dce253551e2fc007ecf4a08d19948e547afc76f24fa6f2c6d408bbfbac610fb23b978a842ad65de12 languageName: node linkType: hard
Update roster version
Update roster version
e818c02dc2f09fd3329f041f161ccd370d93993f
--- package-lock.json @@ -4365,9 +4365,9 @@ } }, "@walmart/payrollsolution_miniapp": { - "version": "0.116.0", - "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.116.0.tgz", - "integrity": "sha512-edPLAoKl4cOWyYkx/UXQjtXRyGQPOsGRMGbV6ycQ82QDooEGYwPaouBR+bBTCFXIgIwDqtxXpVynzM2H3pmk1g==" + "version": "0.121.0", + "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.121.0.tgz", + "integrity": "sha512-wYvVJudexj4jLHJVAStx/Ukbn46w2oU/ZYG33snzHHUt55lcbw5KbsZvc59KrojNhMwbg4YcagfL53zr7dSWUw==" }, "@walmart/price-changes-mini-app": { "version": "1.2.1", @@ -4400,7 +4400,7 @@ "@walmart/react-native-shared-navigation": { "version": "0.4.0", "resolved": "https://npme.walmart.com/@walmart/react-native-shared-navigation/-/react-native-shared-navigation-0.4.0.tgz", - "integrity": "sha1-dBX44FzZJKjZPuXiMoFiFQzybYE=" + "integrity": "sha512-xXCe5sJeytOO9HAKLaTiQQMzomfUS2wUP6ICLYv9BGtdJUDmoKNT7aFYeRDGPgvPvkc1A8oFrqJIrOshjLnxSg==" }, "@walmart/react-native-sumo-sdk": { "version": "2.2.1", @@ -4584,9 +4584,9 @@ } }, "@walmart/welcomeme-mini-app": { - "version": "0.60.0", - "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.60.0.tgz", - "integrity": "sha512-Xrea15bq1908UCipB1La9w0MAT08Melb+X7bDH2zWbheznRTtjysYrHHZFImU20hmhjYkxDoxcYx+lDrikd92A==" + "version": "0.63.0", + "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.63.0.tgz", + "integrity": "sha512-Vmg+D2rF7hJQ86xsAJv0O2UE535UbjgertmvjihRYZgWyFHNQfS2zu+50wO7usK1yvZyyAs1njy85WX2yP7wVw==" }, "@walmart/wfm-ui": { "version": "0.2.14", --- package.json @@ -89,7 +89,7 @@ "@walmart/manager-approvals-miniapp": "0.0.59", "@walmart/metrics-mini-app": "0.7.65", "@walmart/moment-walmart": "1.0.4", - "@walmart/payrollsolution_miniapp": "0.116.0", + "@walmart/payrollsolution_miniapp": "0.121.0", "@walmart/price-changes-mini-app": "1.2.1", "@walmart/push-to-talk-mini-app": "0.5.124", "@walmart/react-native-env": "^0.2.0", @@ -104,7 +104,7 @@ "@walmart/taskit-mini-app": "0.19.0", "@walmart/time-clock-mini-app": "0.5.1", "@walmart/ui-components": "1.4.0-rc.0", - "@walmart/welcomeme-mini-app": "0.60.0", + "@walmart/welcomeme-mini-app": "0.63.0", "@walmart/wfm-ui": "0.2.14", "axios-cache-adapter": "2.7.3", "crypto-js": "^3.3.0",
build: welcomeMe - v0.63.0 | payroll - v0.121.0
build: welcomeMe - v0.63.0 | payroll - v0.121.0
f92beca636ced5f389a277c91917ebe13a3ca2d4
--- packages/my-walmart-hub/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.6.7](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/my-walmart-hub@1.6.6...@walmart/my-walmart-hub@1.6.7) (2025-12-08) + +**Note:** Version bump only for package @walmart/my-walmart-hub + ## [1.6.6](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/my-walmart-hub@1.6.5...@walmart/my-walmart-hub@1.6.6) (2025-12-08) **Note:** Version bump only for package @walmart/my-walmart-hub --- packages/my-walmart-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/my-walmart-hub", - "version": "1.6.6", + "version": "1.6.7", "description": "My Walmart Hub - A comprehensive hub framework for building dynamic widget-based interfaces", "main": "lib/index.js", "types": "lib/index.d.ts",
chore(version): updating package version
chore(version): updating package version - @walmart/my-walmart-hub@1.6.7
56b0c3bf34d0916591e1102ac8f0df63fd7f653e
--- src/screens/ChannelsScreen.tsx @@ -143,6 +143,10 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = ( extraData={extraData} estimatedItemSize={100} contentInset={{bottom: bottomInset, top: channelTopMargin}} + contentContainerStyle={{ + paddingTop: channelTopMargin, + paddingBottom: bottomInset, + }} /> ) : ( <TextingDisabledScreen --- src/screens/ChannelsScreen.tsx @@ -143,6 +143,10 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = ( extraData={extraData} estimatedItemSize={100} contentInset={{bottom: bottomInset, top: channelTopMargin}} + contentContainerStyle={{ + paddingTop: channelTopMargin, + paddingBottom: bottomInset, + }} /> ) : ( <TextingDisabledScreen
update top margin for channel screen
update top margin for channel screen
7d360d22a9ba05e6847aae2923b8fc375ce6e990
--- package-lock.json @@ -3133,9 +3133,24 @@ "integrity": "sha512-Nw48GsUKz2HkFr1qjavFld2pryaG9Jzn/QPT9C/xk7UgxTs4UeCmSJEZ99oLeSIV3TA9rgAH8dThkqzwmjP6ew==" }, "@walmart/iteminfo-mini-app": { - "version": "0.1.1", - "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-0.1.1.tgz", - "integrity": "sha512-ps86IwA3ngCpgZ842p98VVgMCoIMFVkbrnEacSLGBP+2nzRA/ExuuJHW/czQBKsn7zB6f6ki0uGyMfHNAG/OBA==" + "version": "1.0.1", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-1.0.1.tgz", + "integrity": "sha512-JZQNletV6dQHxBg7FDj+kK274uZ9iG0XMV5penlfIksItSSRNrR3SQ3qQOe0bKCfXB9ABjnExcTreBeP74TuhQ==", + "requires": { + "react-native-chart-kit": "6.6.1" + }, + "dependencies": { + "react-native-chart-kit": { + "version": "6.6.1", + "resolved": "https://npme.walmart.com/react-native-chart-kit/-/react-native-chart-kit-6.6.1.tgz", + "integrity": "sha512-aYPqKW37CxOVnP6jWq+I7mQ4AWJ6kDvD2InMI143ShQCmOmWGMbykIgFZ3xs8KFCgQx8YUaPgnvayH9zuOP07Q==", + "requires": { + "lodash": "^4.17.13", + "paths-js": "^0.4.10", + "point-in-polygon": "^1.0.1" + } + } + } }, "@walmart/moment-walmart": { "version": "1.0.4", @@ -12389,16 +12404,6 @@ "xdate": "^0.8.0" } }, - "react-native-chart-kit": { - "version": "6.11.0", - "resolved": "https://npme.walmart.com/react-native-chart-kit/-/react-native-chart-kit-6.11.0.tgz", - "integrity": "sha512-mRSfW+mcyVSi0UZKFucru5h5TPB6UcWrMi/DphICRpPJWlvIVAv/6VYGFA57NFDLoRVufFjbsRRrms+TOq61jw==", - "requires": { - "lodash": "^4.17.13", - "paths-js": "^0.4.10", - "point-in-polygon": "^1.0.1" - } - }, "react-native-circular-progress": { "version": "1.3.6", "resolved": "https://npme.walmart.com/react-native-circular-progress/-/react-native-circular-progress-1.3.6.tgz", --- package.json @@ -63,7 +63,7 @@ "@redux-saga/testing-utils": "^1.1.3", "@sharcoux/slider": "^5.2.1", "@terrylinla/react-native-sketch-canvas": "^0.8.0", - "@walmart/iteminfo-mini-app": "0.1.1", + "@walmart/iteminfo-mini-app": "1.0.1", "@walmart/allspark-health-survey-mini-app": "0.0.38", "@walmart/allspark-home-mini-app": "0.4.0", "@walmart/allspark-me-mini-app": "0.1.0", @@ -100,7 +100,6 @@ "react-native": "0.63.2", "react-native-barcode-builder": "^2.0.0", "react-native-biometrics": "^2.1.4", - "react-native-chart-kit": "^6.11.0", "react-native-circular-progress": "^1.3.6", "react-native-connect-sso-redux": "^1.0.0-rc1", "react-native-device-info": "^5.6.5",
bumping up iteminfo version
bumping up iteminfo version
ddcc29d48a34272c2221c4704e20cabadf94c646
--- .yarnrc.yml @@ -8,4 +8,4 @@ logFilters: nodeLinker: node-modules -npmRegistryServer: ${REPOSOLNS_NPM_REPO} +npmRegistryServer: "https://npm.ci.artifacts.walmart.com/artifactory/api/npm/allspark-npm"
test with hardcoded yml
test with hardcoded yml
507e339b37a26bd9135bd90662f73d815a22dc18
--- .eslintrc.js @@ -1,7 +1,7 @@ // https://docs.expo.dev/guides/using-eslint/ module.exports = { extends: ['expo'], - ignorePatterns: ['schema.types.ts', 'schema.types.d.ts', 'packages/**/lib/','__mocks__/**'], + ignorePatterns: ['schema.types.ts', 'schema.types.d.ts', 'packages/**/lib/', '__mocks__/**'], rules: { '@typescript-eslint/no-unused-vars': [ 'error', --- jest.config.ts @@ -72,7 +72,7 @@ const config: Config = { '<rootDir>/scripts/dependencies-map/__tests__/*', '<rootDir>/packages/me-at-walmart-container', '.eslintrc.js', - '*.temp.*', + '.*\\.temp\\..*', ], coveragePathIgnorePatterns: ['^.+\\.(png)$'], }; --- src/hooks/useDesignMode.tsx @@ -1,9 +1,9 @@ -import { ConfigSelectors } from '@walmart/allspark-foundation/Config'; -import { Switch } from '@walmart/gtp-shared-components'; -import { createSelector } from 'reselect'; -import { useEffect, useState, useSyncExternalStore } from 'react'; -import { useSelector } from 'react-redux'; -import { createExternalStore } from '@/utils/createExternalStore'; +import {ConfigSelectors} from '@walmart/allspark-foundation/Config'; +import {Switch} from '@walmart/gtp-shared-components'; +import {createSelector} from 'reselect'; +import {useEffect, useState, useSyncExternalStore} from 'react'; +import {useSelector} from 'react-redux'; +import {createExternalStore} from '@/utils/createExternalStore'; export type DesignMode = 'classic' | 'modern'; @@ -46,11 +46,11 @@ export const useDesignMode = () => { designModeStore.set(newMode); }; - return { mode, toggle, isHydrated: isInitialized }; + return {mode, toggle, isHydrated: isInitialized}; }; export const DesignModeSwitch = () => { - const { mode, toggle, isHydrated } = useDesignMode(); + const {mode, toggle, isHydrated} = useDesignMode(); // Optionally, show a placeholder while hydrating. if (!isHydrated || mode === undefined) { @@ -64,7 +64,7 @@ export const DesignModeSwitch = () => { testID="design_mode" isOn={mode === 'modern'} onValueChange={toggle} - UNSAFE_style={{ marginTop: 16 }} + UNSAFE_style={{marginTop: 16}} /> ); }; --- src/utils/createExternalStore.tsx @@ -1,5 +1,5 @@ -import { Logger } from '../core/Logger'; -import { LocalStorage } from '@/core/LocalStorage'; +import {Logger} from '../core/Logger'; +import {LocalStorage} from '@/core/LocalStorage'; type Subscriber = () => void; type ServerValue<T> = () => T; @@ -39,7 +39,7 @@ export function createExternalStore<T>( const storageKey = options?.storageKey; const log = options?.logger || ((message: string, error?: Error) => { if (error) { - Logger.error(message, { message: error.message }); + Logger.error(message, {message: error.message}); } else { Logger.debug(message); }
chore(lint): lint fixes
chore(lint): lint fixes
54a7925d691287225638920a51aa4e1d624c64da
--- src/navigation/AssociateHallwayNav/MainStackNav.tsx @@ -54,7 +54,7 @@ import { MetricsPreSubInfoModalScreen, MetricsFtprInfoModalScreen, MetricsFtprTabNavigation, -} from '@walmart/metrics-mini-app/dist/screens'; +} from '@walmart/metrics-mini-app'; const DEFAULT_INACTIVITY_TIME = 300000; const DEFAULT_BACKGROUND_IDLE_TIME = 14400000;
fixing importing screens
fixing importing screens
4fda4579c02a6488f2125c8288bca7728435f7ea
--- core/src/startup/AppFlow.ts @@ -9,12 +9,12 @@ import { spawn, take, } from 'redux-saga/effects'; +import i18next from 'i18next'; import {AuthActionTypes, AuthService} from '@walmart/allspark-foundation/Auth'; import {UserActionTypes} from '@walmart/allspark-foundation/User'; import {AllsparkNavigationClient} from '@walmart/allspark-foundation/Navigation'; import {NetworkSelectors} from '@walmart/allspark-foundation/Network'; -import {AllsparkTranslationClient} from '@walmart/allspark-foundation/Translation'; import { MeAtWalmartAuthActions, MeAtWalmartUserSelectors, @@ -33,6 +33,7 @@ import {waitForUser} from './UserFlow'; import {waitForAuth} from './AuthFlow'; import {candidateStartupFlow} from './CandidateStartup'; import {associateStartupFlow} from './AssociateStartup'; +import {AllsparkTranslationClient} from '@walmart/allspark-foundation'; // @TODO - Have PTT remove network event listener. Setup another way. // Have manager approval remove use of sign in action data and use selector @@ -44,7 +45,7 @@ export function* captureMissedMiniAppEvents(): any { const getUserAction = yield take(UserActionTypes.FETCH_SUCCESS); // Wait for mini app load - yield take(ContainerActionTypes.SAFE_FOR_FEATURES); + yield take(ContainerActionTypes.STARTUP_COMPLETE); // Dispatch missed actions / emit missed events const networkType = yield select(NetworkSelectors.getNetworkType); @@ -52,7 +53,7 @@ export function* captureMissedMiniAppEvents(): any { // Mini apps add resources on init. The initial init happens before their // listeners are created, so we can manually fire event again to load their resources. // Translations should be added to Allspark feature module in the future - AllsparkTranslationClient.emit('initialized'); + i18next.emit('initialized', AllsparkTranslationClient.options); yield all([ // For those mini apps expecting network actions to init services
fix: default i18n instance initialized event not fired for mini apps with legacy setup
fix: default i18n instance initialized event not fired for mini apps with legacy setup
aec3c6285aef9d4bb1d4ff6ae65ba8f60ea52ba4
--- core/__tests__/home/containers/CelebrationListScreenTest.tsx @@ -1,7 +1,6 @@ import React, {useRef, useState} from 'react'; import {create} from 'react-test-renderer'; -import {render, fireEvent} from '@testing-library/react-native'; -import {Dimensions, ScaledSize, Animated} from 'react-native'; +import {Dimensions, ScaledSize} from 'react-native'; import {responseWithData} from '../mockData/celebration'; import { CelebrationListScreen,
code cleanup
code cleanup
88de3050ef2a699b8988633682136d56f961abe3
--- __tests__/navigation/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -113,6 +113,9 @@ Array [ <Screen name="profile.personalSettingsScreen" /> + <Screen + name="profile.selfIdScreen" + /> <Screen name="paymentselection" /> @@ -340,17 +343,6 @@ Array [ } /> </Group> - <Group - screenOptions={ - Object { - "presentation": "transparentModal", - } - } - > - <Screen - name="profile.preferredNameSnackbar" - /> - </Group> </Navigator>, <NotificationsContainer />, ] @@ -469,6 +461,9 @@ Array [ <Screen name="profile.personalSettingsScreen" /> + <Screen + name="profile.selfIdScreen" + /> <Screen name="paymentselection" /> @@ -696,17 +691,6 @@ Array [ } /> </Group> - <Group - screenOptions={ - Object { - "presentation": "transparentModal", - } - } - > - <Screen - name="profile.preferredNameSnackbar" - /> - </Group> </Navigator>, <NotificationsContainer />, ] --- package-lock.json @@ -65,7 +65,7 @@ "@walmart/pay-stub-miniapp": "0.9.35", "@walmart/payrollsolution_miniapp": "0.130.46", "@walmart/price-changes-mini-app": "1.9.4", - "@walmart/profile-feature-app": "0.252.0", + "@walmart/profile-feature-app": "0.264.0", "@walmart/push-to-talk-mini-app": "1.12.1", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", @@ -5670,7 +5670,9 @@ } }, "node_modules/@walmart/profile-feature-app": { - "version": "0.252.0", + "version": "0.264.0", + "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.264.0.tgz", + "integrity": "sha512-eUskSC+WyngH514R2GtWo1kDlry1FYhqPlHc5cbAscMZZHMg2v14YhXhQ59YWCJa9xBDkeZ0HOBVZK4dDa80FA==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/bottom-tabs": "^6.0.0", @@ -25304,7 +25306,9 @@ "version": "1.9.4" }, "@walmart/profile-feature-app": { - "version": "0.252.0" + "version": "0.264.0", + "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.264.0.tgz", + "integrity": "sha512-eUskSC+WyngH514R2GtWo1kDlry1FYhqPlHc5cbAscMZZHMg2v14YhXhQ59YWCJa9xBDkeZ0HOBVZK4dDa80FA==" }, "@walmart/push-to-talk-mini-app": { "version": "1.12.1" --- package.json @@ -107,7 +107,7 @@ "@walmart/pay-stub-miniapp": "0.9.35", "@walmart/payrollsolution_miniapp": "0.130.46", "@walmart/price-changes-mini-app": "1.9.4", - "@walmart/profile-feature-app": "0.252.0", + "@walmart/profile-feature-app": "0.264.0", "@walmart/push-to-talk-mini-app": "1.12.1", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", --- src/navigation/AssociateHallwayNav/MainStackNav.tsx @@ -55,8 +55,7 @@ import { PersonalSettingsNav, ProfilePictureCard, ProfilePictureOptionScreen, - snackbarTransitionOptions, - SuccessSnackbar, + SelfIdNav, } from '@walmart/profile-feature-app'; import { FWBNav, @@ -188,6 +187,7 @@ export const MainStackNav = () => { name='profile.personalSettingsScreen' component={PersonalSettingsNav} /> + <MainStack.Screen name='profile.selfIdScreen' component={SelfIdNav} /> <MainStack.Screen name='paymentselection' component={PaymentSelectionMiniApp} @@ -379,16 +379,6 @@ export const MainStackNav = () => { component={ProfilePictureOptionScreen} /> </MainStack.Group> - <MainStack.Group - screenOptions={{ - presentation: 'transparentModal', - ...snackbarTransitionOptions, - }}> - <MainStack.Screen - name='profile.preferredNameSnackbar' - component={SuccessSnackbar} - /> - </MainStack.Group> </MainStack.Navigator> {/* PTT Notifications Container */}
bump profile-feature-app to 0.264.0
bump profile-feature-app to 0.264.0
a986c3d0db12ef5c3f94f8aae0a73eede174b708
--- package.json @@ -522,8 +522,7 @@ "yargs": "^17.0.1", "zustand": "^4.3.9", "@stomp/stompjs": "^7.0.0", - "@react-native-community/art@npm:^1.2.0": "patch:@react-native-community/art@npm%3A1.2.0#~/.yarn/patches/@react-native-community-art-npm-1.2.0-1c93d63acc.patch", - "@walmart/ui-components@npm:^1.15.11": "patch:@walmart/ui-components@npm%3A1.15.14#~/.yarn/patches/@walmart-ui-components-npm-1.15.14-a6f67304be.patch" + "@react-native-community/art@npm:^1.2.0": "patch:@react-native-community/art@npm%3A1.2.0#~/.yarn/patches/@react-native-community-art-npm-1.2.0-1c93d63acc.patch" }, "expo": { "autolinking": { --- yarn.lock @@ -7270,6 +7270,28 @@ __metadata: languageName: node linkType: hard +"@walmart/ui-components@patch:@walmart/ui-components@npm%3A1.15.14#~/.yarn/patches/@walmart-ui-components-npm-1.15.14-a6f67304be.patch": + version: 1.15.14 + resolution: "@walmart/ui-components@patch:@walmart/ui-components@npm%3A1.15.14#~/.yarn/patches/@walmart-ui-components-npm-1.15.14-a6f67304be.patch::version=1.15.14&hash=8586d9" + dependencies: + "@walmart/ui-components": "npm:^1.15.11" + react-hook-form: "npm:^7.33.1" + react-native-calendars: "npm:1.299.0" + react-native-elements: "npm:^3.4.2" + peerDependencies: + "@react-navigation/stack": ">=6.1.0" + "@walmart/allspark-utils": ^1.6.5 + "@walmart/gtp-shared-components": ^2.0.0 + javascript-time-ago: ">=2.3.4" + react-native-background-timer: ">=2.4.1" + react-native-hyperlink: ">=0.0.19" + react-native-modal: ^11.6.1 + react-native-safe-area-context: ">=3.1.3" + react-native-webview: ">=10.10.2" + checksum: 10c0/dc25ec241ef339c3ffe9754362b44c52fa581d49a3ee966531371c84e835270b083bce131961aae7b5350457d4b0d76e7b0fcfc28b992b83ade57a4781c65f01 + languageName: node + linkType: hard + "@walmart/virtual-zpl-printer-model@npm:^0.2.11": version: 0.2.11 resolution: "@walmart/virtual-zpl-printer-model@npm:0.2.11" @@ -7767,7 +7789,7 @@ __metadata: "@walmart/taskit-mini-app": "npm:2.81.15" "@walmart/time-clock-mini-app": "npm:2.353.0" "@walmart/topstock-mini-app": "patch:@walmart/topstock-mini-app@npm%3A1.9.7#~/.yarn/patches/@walmart-topstock-mini-app-npm-1.9.7-e6400c510e.patch" - "@walmart/ui-components": "npm:1.15.14" + "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.15.14#~/.yarn/patches/@walmart-ui-components-npm-1.15.14-a6f67304be.patch" "@walmart/welcomeme-mini-app": "npm:0.90.3" "@walmart/wfm-ui": "npm:0.8.7" "@walmart/wm-plus-mini-app": "npm:0.12.20"
yarn lock fix
yarn lock fix
0ab867f0463cb618d8ed1d6edb8f8b4444d2ff02
--- packages/allspark-foundation-hub/src/HubFeature/Shared/Components/SearchInput/ModalTeamListItem.tsx @@ -7,6 +7,7 @@ import { useTelemetryService } from '@walmart/allspark-foundation/Telemetry'; import { ModalTeamListItemProps } from './types'; import { useAllsparkImage } from '@walmart/allspark-foundation/Components/context'; import { useUserPersonaType } from '../../../Store//Hooks/useUserPersonaType'; +import { Images } from '../../../Store/Images/images'; export const ModalTeamListItem = ({ isSelected, @@ -27,27 +28,25 @@ export const ModalTeamListItem = ({ onPress={onSelect} > <View style={styles.teamOuterContainer}> - {teamImage && ( - <TeamImage - resizeMode='contain' - source={{ - uri: teamImage.uri, - }} - placeholder={teamImage.placeholder} - style={styles.teamImage} - onError={(error) => { - logger.error('ImageFailure', { - message: `Image failure for ${teamId}: ${error}`, - }); - telemetryService.logEvent('image_uri_failure', { - message: 'Image failure', - teamId: teamId, - teamName: teamName, - personaType: personaType, - }); - }} - /> - )} + <TeamImage + resizeMode='contain' + source={{ + uri: teamImage?.uri, + }} + placeholder={Images['0000000']?.blurhash} + style={styles.teamImage} + onError={(error) => { + logger.error('ImageFailure', { + message: `Image failure for ${teamId}: ${error}`, + }); + telemetryService.logEvent('image_uri_failure', { + message: 'Image failure', + teamId: teamId, + teamName: teamName, + personaType: personaType, + }); + }} + /> <View accessible={true} accessibilityLabel={`${teamName}`} --- packages/allspark-foundation-hub/src/HubFeature/Shared/Components/SearchInput/types.ts @@ -19,7 +19,6 @@ export interface ModalTeamListItemProps { teamName: string; teamImage?: { uri: string; - placeholder: string; }; onSelect: () => void; }
Adding placeholder
Adding placeholder
d3f689c4e97a28aaad3cac4d5194ad8a05c88013
--- packages/allspark-redux-store/src/store/deprecated.ts @@ -64,3 +64,13 @@ export const reducerManager: Pick< addReducer: (...params) => getStore().addReducer(...params), removeReducer: (...params) => getStore().removeReducer(...params), }; + +export const CommonReduxStore: Pick< + SharedReduxStore, + 'dispatch' | 'addSagas' | 'addReducer' | 'removeReducer' | 'select' +> = { + dispatch, + addSagas, + ...reducerManager, + select: (selector) => getStore().select(selector), +};
refactor: add common redux store for global reference
refactor: add common redux store for global reference
d925193d6586ccb5fe7dcc4f2783be0c5be9fb7b
--- packages/me-at-walmart-container/src/network/getNetworkAttributes.ts @@ -25,7 +25,7 @@ export const getNetworkAttributes = (state: NetworkDetails) => { return { wifiStrength, - networkType: state.type, + networkType: state.type || '', connectionType: state.connectionType || '', isConnected: String(state.isConnected), isInternetReachable: String(state.isInternetReachable),
reverting networktyp undefine when type is undefine
reverting networktyp undefine when type is undefine
ada3c403411fa1f42d21fb27075d405d12b840bf
--- __tests__/harness/mockedDependencies/navigation.ts @@ -0,0 +1,6 @@ +import {useNavigation} from '@react-navigation/native'; +import {StackNavigationProp} from '@react-navigation/stack'; +import {TextingNavParamsMap} from '../../../src/navigation'; + +export const mockRosterScreenNavigation = + useNavigation() as StackNavigationProp<TextingNavParamsMap, 'myTeam.tabs'>; --- __tests__/harness/utils.ts @@ -0,0 +1,4 @@ +import {waitFor} from '@testing-library/react-native'; + +export const finishPendingRequests = async () => + await waitFor(() => new Promise((res) => setTimeout(res, 0))); --- __tests__/screens/RosterScreen/AssociateListTest.tsx @@ -1,20 +1,15 @@ import React from 'react'; -import {renderWithProviders} from '../../harness'; +const {renderWithProviders} = require('../../harness'); import {RosterScreen} from '../../../src/screens/RosterScreen'; -import {useNavigation} from '@react-navigation/native'; -import {StackNavigationProp} from '@react-navigation/stack'; -import {TextingNavParamsMap} from '../../../src/navigation'; +const { + mockRosterScreenNavigation, +} = require('../../harness/mockedDependencies/navigation'); describe('AssociateList', () => { - const mockNavigation = useNavigation() as StackNavigationProp< - TextingNavParamsMap, - 'myTeam.tabs' - >; - describe('RosterFilters', () => { it('should filter for all associates', () => { const rosterScreen = renderWithProviders( - <RosterScreen navigation={mockNavigation} />, + <RosterScreen navigation={mockRosterScreenNavigation} />, ); expect(rosterScreen.toJSON()).toMatchSnapshot(); --- __tests__/screens/RosterScreen/RosterScreenTest.tsx @@ -32,17 +32,3 @@ describe('RosterScreen', () => { it('should render the weekly schedule header', () => {}); it('should not render roster or teams when associate is clocked out', () => {}); }); - -describe('TeamsList', () => { - it('list expands / collapses when pressing show/hide teams button', () => {}); - describe('when collapsed', () => { - it('shows current team as only list item when associate has a team', () => {}); - it('shows total store as only list item when associate not in a team', () => {}); - }); - describe('TeamItem', () => { - it('should show icon for team', () => {}); - it('should show name of team', () => {}); - it('should show clocked in count of team', () => {}); - it('should open team chat screen when pressing message button', () => {}); - }); -}); --- __tests__/screens/RosterScreen/TeamsListTest.tsx @@ -0,0 +1,35 @@ +import React from 'react'; +const {renderWithProviders} = require('../../harness'); +import {RosterScreen} from '../../../src/screens/RosterScreen'; +const { + mockRosterScreenNavigation, +} = require('../../harness/mockedDependencies/navigation'); +const {simulatedUser} = require('../../harness'); +const {finishPendingRequests} = require('../../harness/utils'); + +describe('Roster Screen :: TeamsList', () => { + it('should initially render collapsed state', async () => { + const rosterScreen = renderWithProviders( + <RosterScreen navigation={mockRosterScreenNavigation} />, + ); + expect(rosterScreen.queryByText('Show teams')).toEqual(null); + await finishPendingRequests(); + rosterScreen.getByText('Show teams'); + }); + + it('pressing collapsed state expands list', async () => { + const rosterScreen = renderWithProviders( + <RosterScreen navigation={mockRosterScreenNavigation} />, + ); + await finishPendingRequests(); + const expandTeamsButton = rosterScreen.getByTestId('showTeamFooter'); + rosterScreen.getByText('Show teams'); + await simulatedUser.press(expandTeamsButton); + rosterScreen.getByText('Hide teams'); + expect(rosterScreen.queryByText('Show teams')).toEqual(null); + }); + + describe('has expected elements when collapsed', () => {}); + + describe('has expected elements when expanded', () => {}); +}); --- __tests__/harness/mockedDependencies/navigation.ts @@ -0,0 +1,6 @@ +import {useNavigation} from '@react-navigation/native'; +import {StackNavigationProp} from '@react-navigation/stack'; +import {TextingNavParamsMap} from '../../../src/navigation'; + +export const mockRosterScreenNavigation = + useNavigation() as StackNavigationProp<TextingNavParamsMap, 'myTeam.tabs'>; --- __tests__/harness/utils.ts @@ -0,0 +1,4 @@ +import {waitFor} from '@testing-library/react-native'; + +export const finishPendingRequests = async () => + await waitFor(() => new Promise((res) => setTimeout(res, 0))); --- __tests__/screens/RosterScreen/AssociateListTest.tsx @@ -1,20 +1,15 @@ import React from 'react'; -import {renderWithProviders} from '../../harness'; +const {renderWithProviders} = require('../../harness'); import {RosterScreen} from '../../../src/screens/RosterScreen'; -import {useNavigation} from '@react-navigation/native'; -import {StackNavigationProp} from '@react-navigation/stack'; -import {TextingNavParamsMap} from '../../../src/navigation'; +const { + mockRosterScreenNavigation, +} = require('../../harness/mockedDependencies/navigation'); describe('AssociateList', () => { - const mockNavigation = useNavigation() as StackNavigationProp< - TextingNavParamsMap, - 'myTeam.tabs' - >; - describe('RosterFilters', () => { it('should filter for all associates', () => { const rosterScreen = renderWithProviders( - <RosterScreen navigation={mockNavigation} />, + <RosterScreen navigation={mockRosterScreenNavigation} />, ); expect(rosterScreen.toJSON()).toMatchSnapshot(); --- __tests__/screens/RosterScreen/RosterScreenTest.tsx @@ -32,17 +32,3 @@ describe('RosterScreen', () => { it('should render the weekly schedule header', () => {}); it('should not render roster or teams when associate is clocked out', () => {}); }); - -describe('TeamsList', () => { - it('list expands / collapses when pressing show/hide teams button', () => {}); - describe('when collapsed', () => { - it('shows current team as only list item when associate has a team', () => {}); - it('shows total store as only list item when associate not in a team', () => {}); - }); - describe('TeamItem', () => { - it('should show icon for team', () => {}); - it('should show name of team', () => {}); - it('should show clocked in count of team', () => {}); - it('should open team chat screen when pressing message button', () => {}); - }); -}); --- __tests__/screens/RosterScreen/TeamsListTest.tsx @@ -0,0 +1,35 @@ +import React from 'react'; +const {renderWithProviders} = require('../../harness'); +import {RosterScreen} from '../../../src/screens/RosterScreen'; +const { + mockRosterScreenNavigation, +} = require('../../harness/mockedDependencies/navigation'); +const {simulatedUser} = require('../../harness'); +const {finishPendingRequests} = require('../../harness/utils'); + +describe('Roster Screen :: TeamsList', () => { + it('should initially render collapsed state', async () => { + const rosterScreen = renderWithProviders( + <RosterScreen navigation={mockRosterScreenNavigation} />, + ); + expect(rosterScreen.queryByText('Show teams')).toEqual(null); + await finishPendingRequests(); + rosterScreen.getByText('Show teams'); + }); + + it('pressing collapsed state expands list', async () => { + const rosterScreen = renderWithProviders( + <RosterScreen navigation={mockRosterScreenNavigation} />, + ); + await finishPendingRequests(); + const expandTeamsButton = rosterScreen.getByTestId('showTeamFooter'); + rosterScreen.getByText('Show teams'); + await simulatedUser.press(expandTeamsButton); + rosterScreen.getByText('Hide teams'); + expect(rosterScreen.queryByText('Show teams')).toEqual(null); + }); + + describe('has expected elements when collapsed', () => {}); + + describe('has expected elements when expanded', () => {}); +});
updating tests
updating tests
765f904f93b2fa948fded4812c738e862ff33daa
--- package.json @@ -151,7 +151,7 @@ "@walmart/rn-mobile-sdk-pairing": "2.1.8", "@walmart/rn-receiving-mini-app": "2.5.18", "@walmart/roster-mini-app": "3.3.0", - "@walmart/schedule-mini-app": "2.4.1", + "@walmart/schedule-mini-app": "2.6.1", "@walmart/shelfavailability-mini-app": "1.5.47", "@walmart/shop-gnfr-mini-app": "1.0.421", "@walmart/sidekick-mini-app": "4.205.5", @@ -164,7 +164,7 @@ "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.25.2#~/.yarn/patches/@walmart-ui-components-npm-1.25.2-68606d814b.patch", "@walmart/walmart-fiscal-week": "^0.3.6", "@walmart/welcomeme-mini-app": "1.0.13", - "@walmart/wfm-ui": "3.0.2", + "@walmart/wfm-ui": "3.0.4", "@walmart/wm-plus-mini-app": "1.5.5", "@walmart/wmconnect-mini-app": "3.2.0", "axios": "~1.6.0", --- yarn.lock @@ -7725,7 +7725,7 @@ __metadata: "@walmart/atlas-rn-ui-components@npm:1.3.19": version: 1.3.19 - resolution: "@walmart/atlas-rn-ui-components@npm:1.3.19" + resolution: "@walmart/atlas-rn-ui-components@npm:1.3.19::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fatlas-rn-ui-components%2F-%2F%40walmart%2Fatlas-rn-ui-components-1.3.19.tgz" peerDependencies: "@walmart/gtp-shared-components": ">=2.2.3-rc.1" i18next: ">=23.12.2" @@ -7778,7 +7778,7 @@ __metadata: "@walmart/avp-feature-app@npm:0.25.32": version: 0.25.32 - resolution: "@walmart/avp-feature-app@npm:0.25.32" + resolution: "@walmart/avp-feature-app@npm:0.25.32::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Favp-feature-app%2F-%2F%40walmart%2Favp-feature-app-0.25.32.tgz" peerDependencies: "@react-navigation/native": ">=6.0.8" "@react-navigation/stack": ">=6.1.1" @@ -7793,7 +7793,7 @@ __metadata: "@walmart/avp-shared-library@npm:0.25.28": version: 0.25.28 - resolution: "@walmart/avp-shared-library@npm:0.25.28" + resolution: "@walmart/avp-shared-library@npm:0.25.28::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Favp-shared-library%2F-%2F%40walmart%2Favp-shared-library-0.25.28.tgz" peerDependencies: axios: ^1.3.4 immer: ^9.0.16 @@ -8694,7 +8694,7 @@ __metadata: "@walmart/rn-mobile-sdk-pairing": "npm:2.1.8" "@walmart/rn-receiving-mini-app": "npm:2.5.18" "@walmart/roster-mini-app": "npm:3.3.0" - "@walmart/schedule-mini-app": "npm:2.4.1" + "@walmart/schedule-mini-app": "npm:2.6.1" "@walmart/shelfavailability-mini-app": "npm:1.5.47" "@walmart/shop-gnfr-mini-app": "npm:1.0.421" "@walmart/sidekick-mini-app": "npm:4.205.5" @@ -8707,7 +8707,7 @@ __metadata: "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.25.2#~/.yarn/patches/@walmart-ui-components-npm-1.25.2-68606d814b.patch" "@walmart/walmart-fiscal-week": "npm:^0.3.6" "@walmart/welcomeme-mini-app": "npm:1.0.13" - "@walmart/wfm-ui": "npm:3.0.2" + "@walmart/wfm-ui": "npm:3.0.4" "@walmart/wm-plus-mini-app": "npm:1.5.5" "@walmart/wmconnect-mini-app": "npm:3.2.0" adaptive-expressions: "npm:^4.13.5" @@ -9348,7 +9348,7 @@ __metadata: "@walmart/rn-receiving-mini-app@npm:2.5.18": version: 2.5.18 - resolution: "@walmart/rn-receiving-mini-app@npm:2.5.18" + resolution: "@walmart/rn-receiving-mini-app@npm:2.5.18::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Frn-receiving-mini-app%2F-%2F%40walmart%2Frn-receiving-mini-app-2.5.18.tgz" dependencies: "@walmart/atlas-rn-ui-components": "npm:1.3.19" "@walmart/loadquality-mini-app": "npm:2.0.30" @@ -9398,12 +9398,12 @@ __metadata: languageName: node linkType: hard -"@walmart/schedule-mini-app@npm:2.4.1": - version: 2.4.1 - resolution: "@walmart/schedule-mini-app@npm:2.4.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fschedule-mini-app%2F-%2F%40walmart%2Fschedule-mini-app-2.4.1.tgz" +"@walmart/schedule-mini-app@npm:2.6.1": + version: 2.6.1 + resolution: "@walmart/schedule-mini-app@npm:2.6.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fschedule-mini-app%2F-%2F%40walmart%2Fschedule-mini-app-2.6.1.tgz" dependencies: "@walmart/moment-walmart": "npm:^1.0.4" - "@walmart/wfm-ui": "npm:^3.0.2" + "@walmart/wfm-ui": "npm:^3.0.4" wfm-allspark-data-library: "npm:7.0.0" peerDependencies: "@react-native-community/datetimepicker": ^7.6.2 @@ -9432,7 +9432,7 @@ __metadata: react-redux: ">=7.2.1" redux: ">=4.0.5" reselect: ">=4.0.0" - checksum: 10c0/ebff5d66d98c15638043d522e6276efcfcb28b6772a9cb0a2cc129dd9c1d5cbefc04fa4d7a4610fde8c3d9a3c959f9e26d583855bb7c35cebab2f40f981467fe + checksum: 10c0/f7b67604ab5d093597665044b3abc7f051628edb7ced232a381281fd90e26b92c8e06c94761fe2879195ca17f0f023aa604dea18dbf3155fb915d6ecb56d8eab languageName: node linkType: hard @@ -9816,9 +9816,9 @@ __metadata: languageName: node linkType: hard -"@walmart/wfm-ui@npm:3.0.2, @walmart/wfm-ui@npm:^3.0.2": - version: 3.0.2 - resolution: "@walmart/wfm-ui@npm:3.0.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwfm-ui%2F-%2F%40walmart%2Fwfm-ui-3.0.2.tgz" +"@walmart/wfm-ui@npm:3.0.4, @walmart/wfm-ui@npm:^3.0.4": + version: 3.0.4 + resolution: "@walmart/wfm-ui@npm:3.0.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwfm-ui%2F-%2F%40walmart%2Fwfm-ui-3.0.4.tgz" dependencies: "@walmart/moment-walmart": "npm:1.0.3" string.prototype.matchall: "npm:>=4.0.2" @@ -9831,7 +9831,7 @@ __metadata: react-native-modal: ">=11.5.6" react-native-vector-icons: ">=7.0.0" xdate: ">=0.8.0" - checksum: 10c0/71e7ec38dcbf89dd5c3678b28ba6bb1bc1ceaed2880b790a99226725b7030b9e3afb2fa5513efc8e194d980d4fbd8bd7e841b247c86b22125e6aa66d8947d609 + checksum: 10c0/001575ac70fc4f512255ee6875e125f0df04ddb7fb25b2fc4d5ddb5b4845f785b168c7a7b5faed27864a1f85eb549765a188caac3a1aeb06b0450ceaca06b330 languageName: node linkType: hard @@ -13280,7 +13280,7 @@ __metadata: "es-errors@npm:^1.3.0": version: 1.3.0 - resolution: "es-errors@npm:1.3.0" + resolution: "es-errors@npm:1.3.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fes-errors%2F-%2Fes-errors-1.3.0.tgz" checksum: 10c0/0a61325670072f98d8ae3b914edab3559b6caa980f08054a3b872052640d91da01d38df55df797fcc916389d77fc92b8d5906cf028f4db46d7e3003abecbca85 languageName: node linkType: hard @@ -15515,7 +15515,7 @@ __metadata: "hasown@npm:^2.0.2": version: 2.0.2 - resolution: "hasown@npm:2.0.2" + resolution: "hasown@npm:2.0.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fhasown%2F-%2Fhasown-2.0.2.tgz" dependencies: function-bind: "npm:^1.1.2" checksum: 10c0/3769d434703b8ac66b209a4cca0737519925bbdb61dd887f93a16372b14694c63ff4e797686d87c90f08168e81082248b9b028bad60d4da9e0d1148766f56eb9 @@ -22946,7 +22946,7 @@ __metadata: "set-function-name@npm:^2.0.2": version: 2.0.2 - resolution: "set-function-name@npm:2.0.2" + resolution: "set-function-name@npm:2.0.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fset-function-name%2F-%2Fset-function-name-2.0.2.tgz" dependencies: define-data-property: "npm:^1.1.4" es-errors: "npm:^1.3.0"
fix(schedules): ASWFMT-75750 Fix potential bug for returning LOA (#4645)
fix(schedules): ASWFMT-75750 Fix potential bug for returning LOA (#4645) * fix(schedules): ASWFMT-75750 Fix potential bug for returning LOA assocs * chore: Dummy commit to trigger build --------- Co-authored-by: Maksym Novakh - m0n09mr <Maksym.Novakh0@walmart.com>
d1d25ceecd13e932410bed1f44f33ab04d0609c2
--- example/src/teamHub/tempComponentForTesting/TeamSelectionListItem.tsx @@ -35,6 +35,7 @@ export type TeamName = keyof typeof TeamImageNames; interface TeamSelectionListItemProps { teamName: TeamName; isLastListItem: boolean; + isPrimaryTeam?: boolean; isSelected: boolean; checkboxDisabled: boolean; toggleSelection: () => void; @@ -44,6 +45,7 @@ export const TeamSelectionListItem = ({ teamName, isLastListItem, isSelected, + isPrimaryTeam = false, toggleSelection, checkboxDisabled, }: TeamSelectionListItemProps) => { @@ -56,12 +58,14 @@ export const TeamSelectionListItem = ({ source={Images[TeamImageNames[teamName]]} style={styles.teamImage} /> - <Text style={styles.teamName}>Admin & Support</Text> + <Text style={styles.teamName}>{teamName}</Text> </View> <View style={styles.checkboxContainer}> - <View style={styles.primaryTeamContainer}> - <Text style={styles.primaryTeamText}>Primary Team</Text> - </View> + {isPrimaryTeam && ( + <View style={styles.primaryTeamContainer}> + <Text style={styles.primaryTeamText}>Primary Team</Text> + </View> + )} <Checkbox checked={isSelected} disabled={checkboxDisabled}
feat: fixed team name and made primary dynamic
feat: fixed team name and made primary dynamic
810271fd290ce94b77da95a343beba4276eda23f
--- .pr_agent.toml @@ -0,0 +1,6 @@ +[github_app] +pr_commands = [ + "/review", + "/describe --pr_description.use_description_markers=true", + "/improve", +]
chore(qodo): ALLSPARK-6366 Added PR agent settings to override markers (#4460)
chore(qodo): ALLSPARK-6366 Added PR agent settings to override markers (#4460)
f94f1bbaa788587a0ff135f97576b1251cdf4e04
--- packages/allspark-foundation-hub/src/SupplyChain/Components/EditSavedTeams/EditSavedTeams.tsx @@ -9,8 +9,12 @@ import { PageHeader, PillTeamListItem, FEATURE_ID, + HOME_OFFICE_DOMAIN, } from '../../../Shared'; -import { useAllsparkTranslation } from '@walmart/allspark-foundation'; +import { + UserSelectors, + useAllsparkTranslation, +} from '@walmart/allspark-foundation'; import { useGetSupplyChainAllTeamsBySite } from '../../Hooks/useGetSupplyChainTeamsByStore'; import { useGetSupplyChainTeamsPreferenceQuery } from '../../Hooks/useGetSupplyChainTeamPreference'; import { @@ -40,6 +44,13 @@ const EditSavedTeams = ({ handleEdit }: { handleEdit: () => void }) => { const selecteTeamIds: string[] = useSelector( SC_ManagerExperienceSelectors.getSelectedTeamIDs ); + const currentSiteId = useSelector(UserSelectors.getWorkingSite); + const originalSiteId = useSelector(UserSelectors.getHomeSite); + const isNotPartOfRoster = + currentSiteId && originalSiteId && currentSiteId !== originalSiteId; + const userDomain: string | undefined = useSelector(UserSelectors.getDomain); + const isHomeOffice: boolean = + userDomain?.toLowerCase() === HOME_OFFICE_DOMAIN; const dispatch = useDispatch(); @@ -71,15 +82,7 @@ const EditSavedTeams = ({ handleEdit }: { handleEdit: () => void }) => { const savedData = { data: { supplyChainTeamsByAssociate: { - teams: teams?.length - ? teams - : [ - { - teamId: Images.Default.teamName, - teamName: t('teamShiftSwitcher.defaultTeam'), - teamImage: Images.Default, - }, - ], + teams: teams?.length ? teams : [], errors: [], }, }, @@ -107,6 +110,10 @@ const EditSavedTeams = ({ handleEdit }: { handleEdit: () => void }) => { dispatch(SC_ManagerExperienceCreators.setSelectedTeamIDs([])); }, [dispatch]); + if (isNotPartOfRoster || isHomeOffice) { + return null; + } + return ( <View style={styles.container}> <PageHeader
Update the foundation hub version
Update the foundation hub version
80206e1b291a4e698e6cbe786beef3f239161116
--- targets/US/package.json @@ -110,7 +110,7 @@ "@walmart/gtp-shared-components": "patch:@walmart/gtp-shared-components@npm%3A2.2.3-rc.1#~/.yarn/patches/@walmart-gtp-shared-components-npm-2.2.3-rc.1-0c4d9613f6.patch", "@walmart/ims-print-services-ui": "2.12.0", "@walmart/inbox-mini-app": "0.95.3", - "@walmart/iteminfo-mini-app": "7.15.11", + "@walmart/iteminfo-mini-app": "7.16.2", "@walmart/learning-mini-app": "20.0.32", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-at-walmart-athena-queries": "6.24.0-alpha.0", --- yarn.lock @@ -6340,15 +6340,16 @@ __metadata: languageName: node linkType: hard -"@walmart/iteminfo-mini-app@npm:7.15.11": - version: 7.15.11 - resolution: "@walmart/iteminfo-mini-app@npm:7.15.11" +"@walmart/iteminfo-mini-app@npm:7.16.2": + version: 7.16.2 + resolution: "@walmart/iteminfo-mini-app@npm:7.16.2" peerDependencies: - "@apollo/client": ^3.7.3 + "@apollo/client": ">=3.7.3" "@react-native-community/art": 1.2.0 "@react-navigation/drawer": ">=6.3.0" "@react-navigation/native": ">=6.0.0" "@react-navigation/stack": ">=6.1.0" + "@walmart/allspark-foundation": "*" "@walmart/allspark-utils": ">=1.5.2" "@walmart/ask-sam-mini-app": ">=1.15.4" "@walmart/config-components": ">=4.2.8" @@ -6373,7 +6374,7 @@ __metadata: react-native-barcode-builder: ">=2.0.0" react-native-device-info: ">=10.3.0" react-native-gesture-handler: ">=2.14.0" - react-native-permissions: ">=3.6.1" + react-native-permissions: ">=3.10.1" react-native-qrcode-svg: ">=6.1.2" react-native-safe-area-context: ">=4.7.2" react-native-segmented-control-tab: ">=3.4.1" @@ -6386,7 +6387,7 @@ __metadata: reselect: ">=4.1.0" uuid: ">=3.3.2" victory-native: ">=36.5.0" - checksum: 10c0/9d10e3ed7276a368e7233f0ff9301fc011b9716035bd441b5870d0e7bd43bdd94ae5f593b02e68bc27f45149e0726b948b929ed22b2e50e031b353e970e38064 + checksum: 10c0/f8622cf8174112b58b0a26b5ff12da59df2d8f6468fbab24b9fb01261b102fb7dc2d47d15ac250c55e47c752889d2c0568082f0aa3acc6add5a9e4f12b3c4458 languageName: node linkType: hard @@ -6836,7 +6837,7 @@ __metadata: "@walmart/gtp-shared-components": "patch:@walmart/gtp-shared-components@npm%3A2.2.3-rc.1#~/.yarn/patches/@walmart-gtp-shared-components-npm-2.2.3-rc.1-0c4d9613f6.patch" "@walmart/ims-print-services-ui": "npm:2.12.0" "@walmart/inbox-mini-app": "npm:0.95.3" - "@walmart/iteminfo-mini-app": "npm:7.15.11" + "@walmart/iteminfo-mini-app": "npm:7.16.2" "@walmart/learning-mini-app": "npm:20.0.32" "@walmart/manager-approvals-miniapp": "npm:0.2.4" "@walmart/me-at-walmart-athena-queries": "npm:6.24.0-alpha.0"
Drop 24 ItemInfo
Drop 24 ItemInfo
76911cde745e6ae33aabc1ad96900094139dd71c
--- __tests__/navigation/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -40,24 +40,6 @@ Array [ } name="fixIt.alarms" /> - <Screen - component="RefrigerationApp" - initialParams={ - Object { - "navigateToTaskIt": true, - } - } - name="fixIt.alarms.active" - /> - <Screen - component="RefrigerationApp" - initialParams={ - Object { - "navigateToTaskIt": true, - } - } - name="fixIt.alarms.history" - /> <Screen component="HealthSurveyMiniApp" name="HealthSurveyNav" --- src/navigation/AssociateHallwayNav/MainStackNav.tsx @@ -113,18 +113,6 @@ export const MainStackNav = () => { initialParams={{navigateToTaskIt: true}} /> - <MainStack.Screen - name='fixIt.alarms.active' - component={RefrigerationApp} - initialParams={{navigateToTaskIt: true}} - /> - - <MainStack.Screen - name='fixIt.alarms.history' - component={RefrigerationApp} - initialParams={{navigateToTaskIt: true}} - /> - <MainStack.Screen name='HealthSurveyNav' component={HealthSurveyMiniApp}
Updating fixIt screens to single screen
Updating fixIt screens to single screen
b4b4e1cd243b12e5c3c30ea3fa0ed32fa1a20b17
--- packages/allspark-foundation/__tests__/cli/linkUtils.test.ts @@ -1,3 +1,5 @@ +import fs from 'fs'; +import { linkPackage } from '../../src/cli/linkUtils'; import { mergeDeep, isObject, @@ -75,38 +77,3 @@ describe('writeConfig', () => { ); }); }); -describe('Configuration linking functions', () => { - beforeEach(() => { - jest.resetAllMocks(); - }); - describe('linkPackage', () => { - it('should merge package.json correctly', async () => { - const mockPackageConfig = { - dependencies: { 'new-package': '1.0.0' } - }; - const mockPackageJson = { - dependencies: {}, - devDependencies: {} - }; - (fs.existsSync as jest.Mock).mockReturnValue(true); - jest.mock('package.json', () => mockPackageJson, { virtual: true }); - const writeFileSpy = jest.spyOn(fsPromises, 'writeFile').mockResolvedValue(); - await linkPackage(mockPackageConfig); - expect(writeFileSpy).toHaveBeenCalledWith( - expect.stringContaining('package.json'), - expect.stringContaining('"new-package": "1.0.0"') - ); - }); - it('should warn if package.json is not found', async () => { - const mockConsoleWarn = jest.spyOn(console, 'warn').mockImplementation(); - const mockPackageConfig = { - dependencies: { 'new-package': '1.0.0' } - }; - (fs.existsSync as jest.Mock).mockReturnValue(false); - await linkPackage(mockPackageConfig); - expect(mockConsoleWarn).toHaveBeenCalledWith( - expect.stringContaining('Unable to find package.json') - ); - }); - }); -});
Adding back missing imports for unit test
Adding back missing imports for unit test
e23c6742bf524ef3f7475f0b8a563aca4dcbac03
--- android/app/build.gradle @@ -134,7 +134,7 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 45 + versionCode 46 versionName "1.0.2" } splits { --- ios/AllSpark/Info.plist @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>45</string> + <string>46</string> <key>LSApplicationQueriesSchemes</key> <array> <string>invmgmt</string> --- ios/AllSparkTests/Info.plist @@ -19,6 +19,6 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>45</string> + <string>46</string> </dict> </plist>
Incrementing build number
Incrementing build number
390d894ea97d203176ff1b9d9c7adae0c0a93f5c
--- src/navigation/AssociateHallwayNav/Tabs/HomeStackNav.tsx @@ -51,10 +51,10 @@ export const InboxHeaderRight = () => { const [badgesCount] = useBadgesCount(0); const navigtion = useNavigation<NavigationProp<HomeRouteParams>>(); const onPress = () => { - navigtion.navigate('inbox'); WmTelemetry.logEvent('inbox_icon_', 'clicked_header', { composite_app: appJson.displayName, }); + navigtion.navigate('inbox'); }; const enabled = useSelector(getInboxHeaderEnabled);
adding telemetry before navigate
adding telemetry before navigate
a9e40df57f07eb046bb25e8b91ed5a54413253ad
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.12.32", + "version": "2.12.33", "main": "dist/index.js", "files": [ "dist" @@ -85,7 +85,7 @@ "@typescript-eslint/parser": "^5.37.0", "@walmart/allspark-authentication": "6.1.4", "@walmart/allspark-foundation": "6.20.0", - "@walmart/allspark-foundation-hub": "1.0.11-alpha.2", + "@walmart/allspark-foundation-hub": "1.0.11-alpha.3", "@walmart/allspark-graphql-client": "^1.4.6", "@walmart/allspark-http-client": "6.1.4", "@walmart/config-components": "4.4.0", --- yarn.lock @@ -5914,9 +5914,9 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-foundation-hub@npm:1.0.11-alpha.2": - version: 1.0.11-alpha.2 - resolution: "@walmart/allspark-foundation-hub@npm:1.0.11-alpha.2" +"@walmart/allspark-foundation-hub@npm:1.0.11-alpha.3": + version: 1.0.11-alpha.3 + resolution: "@walmart/allspark-foundation-hub@npm:1.0.11-alpha.3" dependencies: "@apollo/client": "npm:^3.8.6" "@graphql-codegen/cli": "npm:^5.0.0" @@ -6012,7 +6012,7 @@ __metadata: allspark-generate-graphql: cli/generate.js allspark-link: cli/link.js allspark-setup: cli/setup.js - checksum: 10c0/b3a9b49bb6b54caed3b8c8875fa9826ca0852713947542811ca74871bea57da8f8ebc1a2e3a7c5d78f09791e2281e6a0d8269ba94169c300245b33ff25dbf77e + checksum: 10c0/d4bb35b0a9e8cac49b473667467808534f2e71f4c948a02bd4b9dface3c7852c5fa1092a93ecb1eedd22f0f26262865946d03316779b34522b8968e9d7c62d3f languageName: node linkType: hard @@ -6464,7 +6464,7 @@ __metadata: "@typescript-eslint/parser": "npm:^5.37.0" "@walmart/allspark-authentication": "npm:6.1.4" "@walmart/allspark-foundation": "npm:6.20.0" - "@walmart/allspark-foundation-hub": "npm:1.0.11-alpha.2" + "@walmart/allspark-foundation-hub": "npm:1.0.11-alpha.3" "@walmart/allspark-graphql-client": "npm:^1.4.6" "@walmart/allspark-http-client": "npm:6.1.4" "@walmart/config-components": "npm:4.4.0"
Update roster version
Update roster version
8dc22d53c86d9da06c8a266a4d65240334158ab0
--- package-lock.json @@ -5390,9 +5390,9 @@ } }, "@walmart/mod-flex-mini-app": { - "version": "1.2.2", - "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.2.2.tgz", - "integrity": "sha512-MUWRK9dBUDagl8QUKE6Y7GrZrk7cshWnd/6b6Lu7ShtwaCOKjk04pv/5KWNRA3S53pTeklkmSowqBi3yu/W/Kg==" + "version": "1.2.4", + "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.2.4.tgz", + "integrity": "sha512-2FZCczhp/EQDJSbwPQLC+sBkk4o0C56bbW/HsBFyeUCdZFLeFCouGnXBA7OgGCzpFyVLTj3ZKMtVbIsqGDpeog==" }, "@walmart/moment-walmart": { "version": "1.0.4", --- package.json @@ -100,7 +100,7 @@ "@walmart/manager-approvals-miniapp": "0.1.1", "@walmart/me-field-mini-app": "1.1.25", "@walmart/metrics-mini-app": "0.9.27", - "@walmart/mod-flex-mini-app": "1.2.2", + "@walmart/mod-flex-mini-app": "1.2.4", "@walmart/moment-walmart": "1.0.4", "@walmart/pay-stub-miniapp": "0.8.6", "@walmart/payrollsolution_miniapp": "0.127.5",
Update mod-flex-mini-app to version 1.2.4
Update mod-flex-mini-app to version 1.2.4
e655d41b2b6e6676b17ce660eabe1d37d2f884ba
--- yarn.lock @@ -6078,9 +6078,9 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-foundation-hub@npm:1.3.11": - version: 1.3.11 - resolution: "@walmart/allspark-foundation-hub@npm:1.3.11" +"@walmart/allspark-foundation-hub@npm:1.3.13": + version: 1.3.13 + resolution: "@walmart/allspark-foundation-hub@npm:1.3.13" dependencies: "@reduxjs/toolkit": "npm:^1.9.7" "@shopify/flash-list": "npm:~1.6.4" @@ -6096,7 +6096,7 @@ __metadata: react: "*" react-native: "*" react-native-safe-area-context: 4.x - checksum: 10c0/87a495903b451745e7ef8a8403580eeacccbec4edb52de26af011841c5e0c845e26eca15aefb0cd10b8838fb091f48c5581cf8ce73934e33b5fbc3f830c820c9 + checksum: 10c0/874219b1bdd0c8a6a8916b2992901b25755e69f5339c00087a03a3222f4623fb4bc3e9a2c086be2a2dad1fcf488f74efab7c23164a37720a5f7bb1a368fdd4e5 languageName: node linkType: hard @@ -6547,7 +6547,7 @@ __metadata: "@typescript-eslint/parser": "npm:^5.37.0" "@walmart/allspark-authentication": "npm:6.1.4" "@walmart/allspark-foundation": "npm:6.27.4" - "@walmart/allspark-foundation-hub": "npm:1.3.11" + "@walmart/allspark-foundation-hub": "npm:1.3.13" "@walmart/allspark-graphql-client": "npm:^1.4.6" "@walmart/allspark-http-client": "npm:6.1.4" "@walmart/config-components": "npm:4.4.0"
Update the roster changes
Update the roster changes
12efa1c806bd68fca7bad54297962d4d508861e9
--- graphql.yml @@ -31,7 +31,7 @@ applications: tags: - 'v1' - name: 'upsertAssociatePreference' - hash: '0b8aaf440c76d96528719ae6352764c50d286c0f2013888a69a927510161161c' + hash: '972c522c6ad0675f13587637cff2dd2ed46937a9878a48a66ad2bc2f7d51a036' queryTemplate: 'packages/me-at-walmart-athena-queries/src/updateAssociatePrivacyPreference.graphql' tags: - 'v1' @@ -58,7 +58,7 @@ applications: tags: - 'v1' - name: 'upsertAssociatePreference' - hash: '0b8aaf440c76d96528719ae6352764c50d286c0f2013888a69a927510161161c' + hash: '972c522c6ad0675f13587637cff2dd2ed46937a9878a48a66ad2bc2f7d51a036' queryTemplate: 'packages/me-at-walmart-athena-queries/src/updateAssociatePrivacyPreference.graphql' tags: - 'v1' --- packages/me-at-walmart-athena-queries/src/updateAssociatePrivacyPreference.graphql @@ -5,6 +5,7 @@ mutation upsertAssociatePreference($associatePreferencesInput: AssociatePreferen __typename displayPreferences { __typename + anniversary birthday } } --- packages/me-at-walmart-athena-queries/src/updateAssociatePrivacyPreference.ts @@ -17,6 +17,7 @@ export type UpsertAssociatePreferenceMutation = { __typename: 'MeAtWalmartPreferences'; displayPreferences?: { __typename: 'DisplayPreferences'; + anniversary?: boolean | null; birthday?: boolean | null; } | null; } | null; @@ -35,6 +36,7 @@ export const UpsertAssociatePreferenceDocument = gql` __typename displayPreferences { __typename + anniversary birthday } }
chore(athena): update upsert query
chore(athena): update upsert query
916f6e125bf20b2eb40c578cdc1a75c0e8b4ed7a
--- .gitignore @@ -50,4 +50,9 @@ ios/ #Yarn install-state.gz -build.context.json \ No newline at end of file +build.context.json + +.claude-flow +.swarm +.yalc +yalc.lock --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "3.6.0", + "version": "3.4.0-alpha.2", "main": "dist/index.js", "files": [ "dist", @@ -34,12 +34,7 @@ "ios": "expo run:ios", "build": "yarn tsc", "prepare": "husky", - "prepublishOnly": "yarn build", - "ci:version-bump": "node -e \"const fs=require('fs'); const pkg=JSON.parse(fs.readFileSync('package.json','utf8')); const semver=require('semver'); pkg.version=semver.inc(pkg.version,'prerelease','alpha'); fs.writeFileSync('package.json',JSON.stringify(pkg,null,2)+'\\n');\"", - "ci:show-version": "node -p \"const pkg=JSON.parse(require('fs').readFileSync('package.json','utf8')); pkg.name + '@' + pkg.version\"", - "ci:check-published": "npm view $(node -p \"require('./package.json').name\")@$(node -p \"require('./package.json').version\") version --registry ${REPOSOLNS_NPM_REPO} 2>/dev/null || echo 'not-published'", - "ci:validate": "yarn lint && yarn coverage && yarn build", - "ci:publish": "npm publish --registry ${REPOSOLNS_NPM_REPO}" + "prepublishOnly": "yarn build" }, "devDependencies": { "@babel/core": "^7.22.10", @@ -93,9 +88,9 @@ "@walmart/react-native-logger": "1.35.0", "@walmart/react-native-scanner-3.0": "0.10.4", "@walmart/react-native-sumo-sdk": "2.8.0", - "@walmart/roster-mini-app": "3.8.1", + "@walmart/roster-mini-app": "3.4.0-alpha.2", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "3.7.0", + "@walmart/wmconnect-mini-app": "3.4.0-alpha.2", "babel-jest": "^29.6.3", "chance": "^1.1.11", "crypto-js": "~4.2.0", --- yarn.lock @@ -6348,9 +6348,9 @@ __metadata: "@walmart/react-native-logger": "npm:1.35.0" "@walmart/react-native-scanner-3.0": "npm:0.10.4" "@walmart/react-native-sumo-sdk": "npm:2.8.0" - "@walmart/roster-mini-app": "npm:3.8.0" + "@walmart/roster-mini-app": "npm:3.4.0-alpha.2" "@walmart/ui-components": "npm:1.15.1" - "@walmart/wmconnect-mini-app": "npm:3.7.0" + "@walmart/wmconnect-mini-app": "npm:3.4.0-alpha.2" babel-jest: "npm:^29.6.3" chance: "npm:^1.1.11" crypto-js: "npm:~4.2.0" @@ -6455,9 +6455,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:3.8.0": - version: 3.8.0 - resolution: "@walmart/roster-mini-app@npm:3.8.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-3.8.0.tgz" +"@walmart/roster-mini-app@npm:3.4.0-alpha.2": + version: 3.4.0-alpha.2 + resolution: "@walmart/roster-mini-app@npm:3.4.0-alpha.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-3.4.0-alpha.2.tgz" peerDependencies: "@walmart/allspark-foundation": ">=6.32.0" expo: ~52.0.46 @@ -6468,7 +6468,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/ef68a0df710730b572e13b3e18397492b3b13106808482b24d1bb02760f599d0a0fda3296cc9a45d37ba7239ab5d513e4d5aa11811fa1d7092f0b569d8854570 + checksum: 10c0/23f73509933c8a99c38f146224609f1c0432567d7389cde8f929ad851d6e99d5a93e9039671a394c3b8b7fd45ce4282847879df3c623aeaaf913c401f6515afa languageName: node linkType: hard @@ -6492,9 +6492,9 @@ __metadata: languageName: node linkType: hard -"@walmart/wmconnect-mini-app@npm:3.7.0": - version: 3.7.0 - resolution: "@walmart/wmconnect-mini-app@npm:3.7.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-3.7.0.tgz" +"@walmart/wmconnect-mini-app@npm:3.4.0-alpha.2": + version: 3.4.0-alpha.2 + resolution: "@walmart/wmconnect-mini-app@npm:3.4.0-alpha.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-3.4.0-alpha.2.tgz" peerDependencies: "@walmart/allspark-foundation": ">=6.32.0" expo: ~52.0.46 @@ -6505,7 +6505,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/981975ee68eda7d59cf3bd337ea9931c4f4abb9ce758ccf2664293da7a93d9dee5950af40e019d2423947548bba23c78b549b5d45240785afee4800090374fd9 + checksum: 10c0/689f63f126024d93e0b7695062aacb12b90dd16fda2a78902df9eaf18e43bbf85a19e9231ceef42a9ba312435d5d2fff9f9bca71b1dc3f2dc0ba35a9e304b134 languageName: node linkType: hard
fix(a11y): fix ada bugs
fix(a11y): fix ada bugs
392f05258674ec65fd6cd4889636b174d812dc6e
--- env.beta.ts @@ -1,3 +1,4 @@ +// Environment Overrides for Beta export default { env: 'prod', graphql: { @@ -8,9 +9,4 @@ export default { }, persistedQueries: true, }, - // TODO: Are these needed or used? - pingFedEnv: 'PROD', - redirectUri: 'com.walmart.squiggly://SSOLogin', - allsparkService: - 'https://developer.api.walmart.com/api-proxy/service/allspark/api/v1', -}; +} as const; --- env.dev.ts @@ -1,3 +1,4 @@ +// Environment Overrides for Dev export default { env: 'dev', graphql: { @@ -5,9 +6,4 @@ export default { url: 'https://athena-gateway.sdev.us.walmart.net', persistedQueries: false, }, - // TODO: Are these needed or used? - pingFedEnv: 'CERT', - redirectUri: 'com.walmart.stores.allspark.beta://SSOLogin', - allsparkService: - 'https://developer.api.stg.walmart.com/api-proxy/service/allspark/api/v1', -}; +} as const; --- env.prod.ts @@ -1,3 +1,4 @@ +// Environment Overrides for Prod export default { env: 'prod', graphql: { @@ -8,9 +9,4 @@ export default { }, persistedQueries: true, }, - // TODO: Are these needed or used? - pingFedEnv: 'PROD', - redirectUri: 'com.walmart.stores.allspark.beta://SSOLogin', - allsparkService: - 'https://developer.api.walmart.com/api-proxy/service/allspark/api/v1', -}; +} as const; --- env.teflon.ts @@ -1,3 +1,4 @@ +// Environment Overrides for Teflon export default { env: 'teflon', graphql: { @@ -8,9 +9,4 @@ export default { }, persistedQueries: true, }, - // TODO: Are these needed or used? - pingFedEnv: 'CERT', - redirectUri: 'com.walmart.stores.allspark.beta://SSOLogin', - allsparkService: - 'https://developer.api.stg.walmart.com/api-proxy/service/allspark/api/v1', -}; +} as const; --- env.ts @@ -0,0 +1,9 @@ +// Environment Overrides for Dev +export default { + env: 'dev' as const, + graphql: { + // url: 'https://developer.api.us.stg.walmart.com/api-proxy/service/ATHENA/GATEWAY/v1', + url: 'https://athena-gateway.sdev.us.walmart.net', + persistedQueries: false, + }, +} as const; --- package.json @@ -13,10 +13,10 @@ "androidConfig:prod": "sh scripts/updateAndroidProjectConfig.sh Prod", "androidConfig:teflon": "sh scripts/updateAndroidProjectConfig.sh Teflon", "coverage": "jest --coverage", - "env:beta": "npm run firebase:beta && cp env.beta.js env.js && npm run projConfig:beta", - "env:dev": "npm run firebase:dev && cp env.dev.js env.js && npm run projConfig:dev", - "env:prod": "npm run firebase:prod && cp env.prod.js env.js && npm run projConfig:prod", - "env:teflon": "npm run firebase:teflon && cp env.teflon.js env.js && npm run projConfig:teflon", + "env:beta": "npm run firebase:beta && cp env.beta.ts env.ts && npm run projConfig:beta", + "env:dev": "npm run firebase:dev && cp env.dev.ts env.ts && npm run projConfig:dev", + "env:prod": "npm run firebase:prod && cp env.prod.ts env.ts && npm run projConfig:prod", + "env:teflon": "npm run firebase:teflon && cp env.teflon.ts env.ts && npm run projConfig:teflon", "firebase:beta": "cp ./ios/GoogleService-Info-Beta.plist ./ios/GoogleService-Info.plist && cp ./android/app/google-services-beta.json ./android/app/google-services.json", "firebase:dev": "cp ./ios/GoogleService-Info-Dev.plist ./ios/GoogleService-Info.plist && cp ./android/app/google-services-dev.json ./android/app/google-services.json", "firebase:prod": "cp ./ios/GoogleService-Info-Prod.plist ./ios/GoogleService-Info.plist && cp ./android/app/google-services-prod.json ./android/app/google-services.json", @@ -43,7 +43,7 @@ "projConfig:teflon": "npm run iosConfig:teflon && npm run androidConfig:teflon", "solidarity": "solidarity", "start": "react-native start", - "test": "cp env.dev.js env.js && jest", + "test": "cp env.dev.ts env.ts && jest", "update:major": "npm version major --no-git-tag-version", "update:minor": "npm version minor --no-git-tag-version", "update:patch": "npm version patch --no-git-tag-version", --- src/index.tsx @@ -1,6 +1,5 @@ import React, {Component} from 'react'; import codePush from 'react-native-code-push'; -import {EnvironmentType} from '@walmart/allspark-foundation/Environment'; import {MeAtWalmartContainer} from '@walmart/me-at-walmart-container'; import {RootStackNavigation} from './navigation'; import env from '../env'; @@ -36,16 +35,7 @@ export class BaseApp extends Component { render() { return ( - <MeAtWalmartContainer.Provider - env={env.env as EnvironmentType} - environmentOverrides={{ - // Persisted Queries on by default. - // Overriding for dynamic queries. - graphql: { - url: 'https://athena-gateway.sdev.us.walmart.net', - persistedQueries: false, - }, - }}> + <MeAtWalmartContainer.Provider env={env.env} environmentOverrides={env}> <RootStackNavigation /> </MeAtWalmartContainer.Provider> );
refactor: update env files to ts for better typing
refactor: update env files to ts for better typing
2be97702dcb6535941d6ed4691c2ca5777c2adb5
--- targets/US/package.json @@ -142,7 +142,7 @@ "@walmart/rn-receiving-mini-app": "2.3.150", "@walmart/roster-mini-app": "2.8.2", "@walmart/schedule-mini-app": "0.118.2", - "@walmart/shelfavailability-mini-app": "1.5.33", + "@walmart/shelfavailability-mini-app": "1.5.37", "@walmart/shop-gnfr-mini-app": "1.0.129", "@walmart/sidekick-mini-app": "4.83.7", "@walmart/store-feature-orders": "1.27.1", --- yarn.lock @@ -7053,7 +7053,7 @@ __metadata: "@walmart/rn-receiving-mini-app": "npm:2.3.150" "@walmart/roster-mini-app": "npm:2.8.2" "@walmart/schedule-mini-app": "npm:0.118.2" - "@walmart/shelfavailability-mini-app": "npm:1.5.33" + "@walmart/shelfavailability-mini-app": "npm:1.5.37" "@walmart/shop-gnfr-mini-app": "npm:1.0.129" "@walmart/sidekick-mini-app": "npm:4.83.7" "@walmart/store-feature-orders": "npm:1.27.1" @@ -7876,21 +7876,21 @@ __metadata: languageName: node linkType: hard -"@walmart/shelfavailability-mini-app@npm:1.5.33": - version: 1.5.33 - resolution: "@walmart/shelfavailability-mini-app@npm:1.5.33" +"@walmart/shelfavailability-mini-app@npm:1.5.37": + version: 1.5.37 + resolution: "@walmart/shelfavailability-mini-app@npm:1.5.37" peerDependencies: "@react-native-community/eslint-config": ^2.0.0 "@react-native-community/masked-view": ^0.1.10 - "@react-native-firebase/analytics": 15.1.1 - "@react-native-firebase/app": 15.1.1 - "@react-native-firebase/crashlytics": 15.1.1 - "@react-native-firebase/database": 15.1.1 - "@react-native-firebase/firestore": 15.1.1 - "@react-native-firebase/perf": 15.1.1 + "@react-native-firebase/analytics": ">=17.4.2" + "@react-native-firebase/app": ">=17.4.2" + "@react-native-firebase/crashlytics": ">=17.4.2" + "@react-native-firebase/database": ">=17.4.2" + "@react-native-firebase/firestore": ">=17.4.2" + "@react-native-firebase/perf": ">=17.4.2" "@react-navigation/native": ^6.0.0 "@react-navigation/stack": ^6.1.0 - "@walmart/allspark-foundation": ">=5.0.0" + "@walmart/allspark-foundation": ">=6.4.0" "@walmart/allspark-utils": ">=1.6.5" "@walmart/gtp-shared-components": ">=2.0.10" "@walmart/impersonation-mini-app": 1.4.0 @@ -7926,7 +7926,7 @@ __metadata: reselect: ^4.1.0 seamless-immutable: ^7.1.4 xdate: ^0.8.2 - checksum: 10c0/bfa2e854f58ad309a3cf593dbd3438757206720c06e510d1fd62f97f222c650c26b0f9c069bde9b5647fa711b3ba2d445d62a8d1a2487cf80e227142e0ac86c4 + checksum: 10c0/49f8708eb053d3f1b5c497aff118c8a68acc5bdc4c074fff422bfc1714b902139535e79d5ffbe22412335bd46062bef3b610f14b674795a33b6c462750c1e499 languageName: node linkType: hard
SA-1.5.37
SA-1.5.37
de95c9c2d38690ed9b7720e41e37b87b27b63348
--- src/managerExperience/screens/RosterDetailScreen/ListEmptyComponent.tsx @@ -1,38 +0,0 @@ -// import React from 'react'; -// import {useTranslation} from 'react-i18next'; -// import {AssociateListLoading} from '../../components/AssociateList/AssociateListLoading'; -// import {ListEmptyComponentProps} from './types'; -// import {ErrorScreen} from '@walmart/allspark-foundation-hub/HubFeature/TeamSelection/Component/ErrorScreen'; -// import {ROSTER_I18N_NAMESPACE} from '../../../translations'; -// import {logger} from '../../../common'; -// import {analytics} from '../../../logger/Analytics'; - -// export const ListEmptyComponent = ({ -// isLoading, -// hasError, -// errorMessage, -// refetch, -// }: ListEmptyComponentProps) => { -// const {t} = useTranslation([ROSTER_I18N_NAMESPACE]); - -// if (isLoading) { -// return <AssociateListLoading />; -// } -// if (hasError) { -// logger.error('error fetching daily roster', {message: errorMessage}); -// return ( -// <ErrorScreen -// errorTitle={t('rosterScreen.allTeamsScreen.somethingWentWrong')} -// errorMessage={t('rosterScreen.allTeamsScreen.refreshThisPage')} -// primaryButtonText={t('rosterScreen.allTeamsScreen.refreshPage')} -// handlePrimaryButtonPress={() => { -// analytics('refresh_roster', { -// message: 'Refresh roster detail screen', -// }); -// refetch(); -// }} -// /> -// ); -// } -// return null; -// }; --- src/managerExperience/screens/RosterDetailScreen/RosterDetailScreen.tsx @@ -2,6 +2,7 @@ import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; import {useTranslation} from 'react-i18next'; import {ROSTER_I18N_NAMESPACE} from '../../../translations'; import {RefreshControl, View} from 'react-native'; +import {ErrorScreen} from '@walmart/allspark-foundation-hub/HubFeature/TeamSelection/Component/ErrorScreen'; import {TeamSwitcher} from '@walmart/allspark-foundation-hub/HubFeature/Hub/TeamSwitcher'; import {ManagerExperienceSelectors} from '@walmart/allspark-foundation-hub/HubFeature/Redux'; import {RosterDetailPageHeader} from '../../components/RosterDetailPageHeader'; @@ -35,8 +36,8 @@ import {StackNavigationProp} from '@react-navigation/stack'; import {TextingNavParamsMap} from '../../../navigation'; import {FlashList} from '@shopify/flash-list'; import {useSafeAreaInsets} from 'react-native-safe-area-context'; +import {AssociateListLoading} from '../../components/AssociateList/AssociateListLoading'; import {AssociateListItem} from '../../components/AssociateList/AssociateListItem'; -// import {ListEmptyComponent} from './ListEmptyComponent'; import {analytics} from '../../../logger/Analytics'; import {logger} from '../../../common/logger'; import moment from 'moment'; @@ -94,18 +95,18 @@ export const RosterDetailScreen = () => { const { loading: teamLoading, data: currentTeamData, - // error: teamError, + error: teamError, } = useGetTeamById(teamState.teamLabel); const { loading: rosterLoading, data: rosterData, - // error: rosterError, + error: rosterError, refetch: refetchRoster, } = useDailyRoster(); const {data: allTeamsData} = useGetTeamsByStore(); const dataLoading = teamLoading || rosterLoading; - // const dataError = teamError || rosterError; + const dataError = teamError || rosterError; const allTeams = useMemo( () => (allTeamsData?.getTeamsByStore || []) as Team[], @@ -239,6 +240,22 @@ export const RosterDetailScreen = () => { [teamState], ); + const renderErrorScreen = () => { + return dataError ? ( + <ErrorScreen + errorTitle={t('rosterScreen.allTeamsScreen.somethingWentWrong')} + errorMessage={t('rosterScreen.allTeamsScreen.refreshThisPage')} + primaryButtonText={t('rosterScreen.allTeamsScreen.refreshPage')} + handlePrimaryButtonPress={() => { + analytics('refresh_roster', { + message: 'Refresh roster detail screen', + }); + refetchRoster(); + }} + /> + ) : null; + }; + useEffect(() => { const associatesFiltered = filterAssociatesByStatusAndSearchInput( teamRoster, @@ -318,14 +335,9 @@ export const RosterDetailScreen = () => { /> </> } - // ListEmptyComponent={ - // <ListEmptyComponent - // isLoading={dataLoading} - // hasError={Boolean(dataError)} - // errorMessage={rosterError?.message ?? ''} - // refetch={refetchRoster} - // /> - // } + ListEmptyComponent={ + dataLoading ? <AssociateListLoading /> : renderErrorScreen() + } renderItem={({item, index}) => ( <View style={styles.associateListContainer}> <AssociateListItem --- src/managerExperience/screens/RosterDetailScreen/types.tsx @@ -4,10 +4,3 @@ import {TextingNavParamsMap} from '../../../navigation'; export interface RosterDetailScreenProps { route: RouteProp<TextingNavParamsMap, 'myTeam.rosterDetail'>; } - -export interface ListEmptyComponentProps { - isLoading: boolean; - hasError: boolean; - errorMessage: string; - refetch: () => void; -}
feat: reverted empty list component
feat: reverted empty list component
29fab12f18b54af26ec1834d4c189373dd97a73e
--- packages/allspark-graphql-client/package.json @@ -9,7 +9,7 @@ "lib": "lib" }, "bin": { - "allspark-graphql-client": "./lib/codegen/generate" + "allspark-graphql-client-generate": "./lib/codegen/generate.js" }, "files": [ "lib"
chore: update codegen
chore: update codegen
c8073c1879af4ffccad401ff92315caf59c893e3
--- package-lock.json @@ -42,8 +42,8 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.18.5", "@walmart/attendance-mini-app": "3.10.0", - "@walmart/avp-feature-app": "0.0.32", - "@walmart/avp-shared-library": "0.0.53", + "@walmart/avp-feature-app": "0.0.33", + "@walmart/avp-shared-library": "0.0.54", "@walmart/calling-mini-app": "0.1.8", "@walmart/compass-sdk-rn": "5.18.15", "@walmart/config-components": "4.2.16", @@ -57,7 +57,7 @@ "@walmart/exception-mini-app": "1.7.3", "@walmart/facilities-management-miniapp": "0.7.3", "@walmart/feedback-all-spark-miniapp": "0.9.52", - "@walmart/financial-wellbeing-feature-app": "1.19.2", + "@walmart/financial-wellbeing-feature-app": "1.19.3", "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.1.0", "@walmart/gtp-shared-components": "2.1.3", @@ -8555,9 +8555,9 @@ } }, "node_modules/@walmart/avp-feature-app": { - "version": "0.0.32", - "resolved": "https://npme.walmart.com/@walmart/avp-feature-app/-/avp-feature-app-0.0.32.tgz", - "integrity": "sha512-tzufBPdEMOANy2H/P3kgQN20mz1kw6U6yQMnSS+LQenPhRF8N60uMF0nnI8ij/HIYGjgEBDqTTaIiMut6YTp5Q==", + "version": "0.0.33", + "resolved": "https://npme.walmart.com/@walmart/avp-feature-app/-/avp-feature-app-0.0.33.tgz", + "integrity": "sha512-5EexWNo/yXnagIqmHoFTZCydvt7fkQoSH3EuFeGmlyJVmyo2vBJSULkHLhxgpVNmDCWF3W3xVZMR54dKl6j2FA==", "hasInstallScript": true, "engines": { "node": ">=16" @@ -8573,9 +8573,9 @@ } }, "node_modules/@walmart/avp-shared-library": { - "version": "0.0.53", - "resolved": "https://npme.walmart.com/@walmart/avp-shared-library/-/avp-shared-library-0.0.53.tgz", - "integrity": "sha512-l65IsvS5OTHL/FO33gZsgHUl/lb/UoE7nZv07dMqTOWdODTw1S1Ym4L79ojt8/SeVKT2GIGUZXRlOGbfVonzRA==", + "version": "0.0.54", + "resolved": "https://npme.walmart.com/@walmart/avp-shared-library/-/avp-shared-library-0.0.54.tgz", + "integrity": "sha512-K3MxeX2RGGw6HOJ4N2KzuJlcYbrhgzWl5XW/BHAZjK/uLc1m9V3qdQDFzwe4WEWC9fLMxF6Q3DpUNaPasoQMqg==", "license": "ISC", "peerDependencies": { "axios": "^1.3.4", @@ -9017,9 +9017,9 @@ } }, "node_modules/@walmart/financial-wellbeing-feature-app": { - "version": "1.19.2", - "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.19.2.tgz", - "integrity": "sha512-LyY9BlSzI0qtFbCGTkbJ0TiBs/cvWrawvcpCoJ9tMfrtFZBR0XHo+z6cQnyXt+5rXM0ww6bUx57TRT6OkYkp4w==", + "version": "1.19.3", + "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.19.3.tgz", + "integrity": "sha512-+DJwozwlTcLW3bw4WOi2YrVE/iZbqlsdoxBz0GicTeS07nYfEq52x7WnhGgVQUPvpXISlxMuD82knKseJGmRhg==", "hasInstallScript": true, "engines": { "node": ">=16" @@ -33248,14 +33248,14 @@ } }, "@walmart/avp-feature-app": { - "version": "0.0.32", - "resolved": "https://npme.walmart.com/@walmart/avp-feature-app/-/avp-feature-app-0.0.32.tgz", - "integrity": "sha512-tzufBPdEMOANy2H/P3kgQN20mz1kw6U6yQMnSS+LQenPhRF8N60uMF0nnI8ij/HIYGjgEBDqTTaIiMut6YTp5Q==" + "version": "0.0.33", + "resolved": "https://npme.walmart.com/@walmart/avp-feature-app/-/avp-feature-app-0.0.33.tgz", + "integrity": "sha512-5EexWNo/yXnagIqmHoFTZCydvt7fkQoSH3EuFeGmlyJVmyo2vBJSULkHLhxgpVNmDCWF3W3xVZMR54dKl6j2FA==" }, "@walmart/avp-shared-library": { - "version": "0.0.53", - "resolved": "https://npme.walmart.com/@walmart/avp-shared-library/-/avp-shared-library-0.0.53.tgz", - "integrity": "sha512-l65IsvS5OTHL/FO33gZsgHUl/lb/UoE7nZv07dMqTOWdODTw1S1Ym4L79ojt8/SeVKT2GIGUZXRlOGbfVonzRA==" + "version": "0.0.54", + "resolved": "https://npme.walmart.com/@walmart/avp-shared-library/-/avp-shared-library-0.0.54.tgz", + "integrity": "sha512-K3MxeX2RGGw6HOJ4N2KzuJlcYbrhgzWl5XW/BHAZjK/uLc1m9V3qdQDFzwe4WEWC9fLMxF6Q3DpUNaPasoQMqg==" }, "@walmart/calling-mini-app": { "version": "0.1.8", @@ -33390,9 +33390,9 @@ "integrity": "sha512-5fGRa3rbOps48Y8nCRl9iFbRQaLU35zpmWN4x/2c7Ip8D7Pd+8QHUQNlaLL+Bdx4OTBACCQ2G+pNIPPqhZRUTw==" }, "@walmart/financial-wellbeing-feature-app": { - "version": "1.19.2", - "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.19.2.tgz", - "integrity": "sha512-LyY9BlSzI0qtFbCGTkbJ0TiBs/cvWrawvcpCoJ9tMfrtFZBR0XHo+z6cQnyXt+5rXM0ww6bUx57TRT6OkYkp4w==" + "version": "1.19.3", + "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.19.3.tgz", + "integrity": "sha512-+DJwozwlTcLW3bw4WOi2YrVE/iZbqlsdoxBz0GicTeS07nYfEq52x7WnhGgVQUPvpXISlxMuD82knKseJGmRhg==" }, "@walmart/functional-components": { "version": "4.0.3", --- package.json @@ -83,8 +83,8 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.18.5", "@walmart/attendance-mini-app": "3.10.0", - "@walmart/avp-feature-app": "0.0.32", - "@walmart/avp-shared-library": "0.0.53", + "@walmart/avp-feature-app": "0.0.33", + "@walmart/avp-shared-library": "0.0.54", "@walmart/calling-mini-app": "0.1.8", "@walmart/compass-sdk-rn": "5.18.15", "@walmart/config-components": "4.2.16", @@ -98,7 +98,7 @@ "@walmart/exception-mini-app": "1.7.3", "@walmart/facilities-management-miniapp": "0.7.3", "@walmart/feedback-all-spark-miniapp": "0.9.52", - "@walmart/financial-wellbeing-feature-app": "1.19.2", + "@walmart/financial-wellbeing-feature-app": "1.19.3", "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.1.0", "@walmart/gtp-shared-components": "2.1.3",
bumped with ASPP changes
bumped with ASPP changes
e5b2f36d970ab79ff327731760df1ae9a4c9e7f5
--- packages/associate-exp-hub-mini-app/src/Translations/locales/en-US.json @@ -70,3 +70,4 @@ "updateTeamsModal.supplyChainTitle": "Update team and shift", "updateTeamsModal.title": "Update team" } +
feat: trigger translations
feat: trigger translations
34da73507cba595b1eb1476a90fa025e38e01679
--- package-lock.json @@ -63,7 +63,7 @@ "@walmart/iteminfo-mini-app": "7.6.3", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-field-mini-app": "14.0.2", - "@walmart/metrics-mini-app": "0.18.5", + "@walmart/metrics-mini-app": "0.18.6", "@walmart/mod-flex-mini-app": "1.13.6", "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.16", @@ -9174,9 +9174,9 @@ } }, "node_modules/@walmart/metrics-mini-app": { - "version": "0.18.5", - "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.18.5.tgz", - "integrity": "sha512-xrLCNucJCQiB5V6MaehLH9gWi1v2P4ovBTxG/HPFnnfh1lgQr7Suih1TJGwdMmaxOH8002TGJgKQ9PPjGWLE3A==", + "version": "0.18.6", + "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.18.6.tgz", + "integrity": "sha512-ace3QwzEfcMPhBdpsQZOzD0X/XYqxLvD2XVjm2rONQQn7sMf/clVKRcb17m5BtIKR+HE5DlfUTPlFZwWWd7NvQ==", "hasInstallScript": true, "dependencies": { "base-64": "^1.0.0" @@ -33211,9 +33211,9 @@ "integrity": "sha512-JGf97zQqXPczaYyCjbkSHZ/inO1AkewmMqaj9GgdIGQumgRL17lLsviNp2drH2yFLMee2JIMx2zMJ0g62LCuPw==" }, "@walmart/metrics-mini-app": { - "version": "0.18.5", - "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.18.5.tgz", - "integrity": "sha512-xrLCNucJCQiB5V6MaehLH9gWi1v2P4ovBTxG/HPFnnfh1lgQr7Suih1TJGwdMmaxOH8002TGJgKQ9PPjGWLE3A==", + "version": "0.18.6", + "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.18.6.tgz", + "integrity": "sha512-ace3QwzEfcMPhBdpsQZOzD0X/XYqxLvD2XVjm2rONQQn7sMf/clVKRcb17m5BtIKR+HE5DlfUTPlFZwWWd7NvQ==", "requires": { "base-64": "^1.0.0" } --- package.json @@ -104,7 +104,7 @@ "@walmart/iteminfo-mini-app": "7.6.3", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-field-mini-app": "14.0.2", - "@walmart/metrics-mini-app": "0.18.5", + "@walmart/metrics-mini-app": "0.18.6", "@walmart/mod-flex-mini-app": "1.13.6", "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.16",
Bumping metrics mini app version
Bumping metrics mini app version
1b258b5cd2126b5587cc49ec61223622240a75d9
--- packages/allspark-foundation-hub/src/HubFeature/BottomSheet/HubOnboardingImage/OnboardingImage.tsx @@ -25,7 +25,7 @@ const HubOnboardingImage = ({ style={styles.imageContainer} resizeMode='contain' onError={(error) => { - logger.info('ImageFailure', { + logger.error('ImageFailure', { message: `Image failure ${error}`, }); telemetryService.logEvent('image_uri_failure', { --- packages/allspark-foundation-hub/src/HubFeature/TeamSelection/Component/TeamSelectionListItem.tsx @@ -53,7 +53,7 @@ export const TeamSelectionListItem = ({ style={styles.teamImage} resizeMode='contain' onError={(error) => { - logger.info('ImageFailure', { + logger.error('ImageFailure', { message: `Image failure for ${teamId}`, error, });
Updating info to error
Updating info to error
7df73266f6644fe708d61708362d4e779df8074e
--- packages/core-services-allspark/package.json @@ -72,7 +72,7 @@ "wifi-store-locator": ">=1.0.0-alpha2" }, "peerDependencies": { - "@react-native-community/async-storage": "^1.12.1", + "@react-native-async-storage/async-storage": "^1.19.0", "@react-native-community/netinfo": "^9.3.6", "@react-native-firebase/analytics": "^15.1.1", "@react-native-firebase/app": "^15.1.1",
feat(httpClient): update peer dependency
feat(httpClient): update peer dependency
7d888a9761abeb6138cd347535a1cc6a3b1eec5f
--- src/hooks/teams.ts @@ -112,12 +112,15 @@ export const useGetRosterByTeam = (teamId: string) => { export const useGetViewersPrimaryTeamId = () => { const viewerTeamIds = useSelector(UserSelectors.getTeamIds); - if (viewerTeamIds.length > 0 && viewerTeamIds[0] !== null) { - return viewerTeamIds[0]; + if (viewerTeamIds.length > 0) { + if (viewerTeamIds[0] !== null) { + return viewerTeamIds[0]; + } else { + logger.error('useGetViewersPrimaryTeamId error', { + message: "error in fetching user's primary team id", + }); + } } - logger.warn('useGetViewersPrimaryTeamId warning', { - message: "could not find user's primary team id", - }); return ''; }; --- src/managerExperience/screens/RosterDetailScreen/RosterDetailScreen.tsx @@ -104,8 +104,7 @@ export const RosterDetailScreen = () => { const {data: allTeamsData} = useGetTeamsByStore(); const dataLoading = teamLoading || rosterLoading; - const dataError = - teamError || rosterError || rosterData?.getDailyRoster?.length === 0; + const dataError = teamError || rosterError; const allTeams = useMemo( () => (allTeamsData?.getTeamsByStore || []) as Team[],
feat: applied pr comments
feat: applied pr comments
9fb245ac0070698bd70a8f2a814ce68826c9369e
--- package-lock.json @@ -41,7 +41,7 @@ "@walmart/core-services": "~1.4.9", "@walmart/core-services-allspark": "~1.10.11", "@walmart/core-utils": "~1.3.0", - "@walmart/core-widget-registry": "~0.7.1", + "@walmart/core-widget-registry": "~0.7.2", "@walmart/counts-component-miniapp": "0.0.39", "@walmart/emergency-mini-app": "1.2.0", "@walmart/exception-mini-app": "0.43.1", @@ -4803,7 +4803,9 @@ } }, "node_modules/@walmart/core-widget-registry": { - "version": "0.7.1", + "version": "0.7.2", + "resolved": "https://npme.walmart.com/@walmart/core-widget-registry/-/core-widget-registry-0.7.2.tgz", + "integrity": "sha512-qCDWQF6Uvg9ftBqG4BHItlS1Fh6B0kzBDa3d9/ObmcAaeiGhWM1H3WkOaNeI+h8j7SoSAHiHeyGVbw+OCpH2sQ==", "license": "ISC", "peerDependencies": { "@walmart/core-utils": "^1.1.2", @@ -24793,7 +24795,9 @@ } }, "@walmart/core-widget-registry": { - "version": "0.7.1" + "version": "0.7.2", + "resolved": "https://npme.walmart.com/@walmart/core-widget-registry/-/core-widget-registry-0.7.2.tgz", + "integrity": "sha512-qCDWQF6Uvg9ftBqG4BHItlS1Fh6B0kzBDa3d9/ObmcAaeiGhWM1H3WkOaNeI+h8j7SoSAHiHeyGVbw+OCpH2sQ==" }, "@walmart/counts-component-miniapp": { "version": "0.0.39" --- package.json @@ -84,7 +84,7 @@ "@walmart/core-services": "~1.4.9", "@walmart/core-services-allspark": "~1.10.11", "@walmart/core-utils": "~1.3.0", - "@walmart/core-widget-registry": "~0.7.1", + "@walmart/core-widget-registry": "~0.7.2", "@walmart/counts-component-miniapp": "0.0.39", "@walmart/emergency-mini-app": "1.2.0", "@walmart/exception-mini-app": "0.43.1",
chore: widget registry version bump
chore: widget registry version bump
393edee276ddc79d53db8ea124911dd6ee1ccbc8
--- __mocks__/expo-asset.js @@ -0,0 +1,7 @@ +module.exports = { + __esModule: true, + default: {}, + Asset: { + fromModule: jest.fn(() => ({ downloadAsync: jest.fn() })) + } +} --- __mocks__/expo-task-manager.js @@ -0,0 +1,10 @@ +module.exports = { + __esModule: true, + default: {}, + TaskManager: { + defineTask: jest.fn(), + unregisterAllTasksAsync: jest.fn(), + startLocationUpdatesAsync: jest.fn(), + stopLocationUpdatesAsync: jest.fn() + } +} --- __mocks__/expo.js @@ -0,0 +1,11 @@ +module.exports = { + __esModule: true, + default: {}, + Expo: { + Constants: { + expoConfig: { + name: 'Me@Walmart', + } + } + } +} --- package.json @@ -119,7 +119,7 @@ "@walmart/me-at-walmart-athena-queries": "6.31.0", "@walmart/me-at-walmart-common": "workspace:^", "@walmart/me-at-walmart-container": "workspace:^", - "@walmart/me-at-walmart-geolocation": "^1.2.0", + "@walmart/me-at-walmart-geolocation": "1.2.0", "@walmart/metrics-mini-app": "1.29.12", "@walmart/mod-flex-mini-app": "1.28.9", "@walmart/moment-walmart": "1.0.4", --- yarn.lock @@ -7293,7 +7293,7 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-foundation@npm:^6.51.1": +"@walmart/allspark-foundation@npm:^6.49.0": version: 6.51.1 resolution: "@walmart/allspark-foundation@npm:6.51.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fallspark-foundation%2F-%2F%40walmart%2Fallspark-foundation-6.51.1.tgz" dependencies: @@ -8381,11 +8381,11 @@ __metadata: languageName: unknown linkType: soft -"@walmart/me-at-walmart-geolocation@npm:^1.2.0": - version: 1.2.4 - resolution: "@walmart/me-at-walmart-geolocation@npm:1.2.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fme-at-walmart-geolocation%2F-%2F%40walmart%2Fme-at-walmart-geolocation-1.2.4.tgz" +"@walmart/me-at-walmart-geolocation@npm:1.2.0": + version: 1.2.0 + resolution: "@walmart/me-at-walmart-geolocation@npm:1.2.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fme-at-walmart-geolocation%2F-%2F%40walmart%2Fme-at-walmart-geolocation-1.2.0.tgz" dependencies: - "@walmart/allspark-foundation": "npm:^6.51.1" + "@walmart/allspark-foundation": "npm:^6.49.0" peerDependencies: "@types/react": ^18.0.27 expo: ~52.0.46 @@ -8393,7 +8393,7 @@ __metadata: expo-task-manager: ^12.0.6 react: ^18.2.0 react-native: ~0.73.7 - checksum: 10c0/9b50c1692e9b0dfef0c80b03dce9478678b5c5c6d22e5d11b22ac0932264ce9b49dba28a27515b758934f2f4a6e7330f27edd0b3efbeb20180f064ad583491ad + checksum: 10c0/09c336ff79601a1eeeeb4e74f682431902034b58b09a3aaf813f0c4464c9230664c080110ac03e15d3f6f5fa64ab2649bd7e3703c292ce422235a0723d4aa7d1 languageName: node linkType: hard @@ -8501,7 +8501,7 @@ __metadata: "@walmart/me-at-walmart-athena-queries": "npm:6.31.0" "@walmart/me-at-walmart-common": "workspace:^" "@walmart/me-at-walmart-container": "workspace:^" - "@walmart/me-at-walmart-geolocation": "npm:^1.2.0" + "@walmart/me-at-walmart-geolocation": "npm:1.2.0" "@walmart/metrics-mini-app": "npm:1.29.12" "@walmart/mod-flex-mini-app": "npm:1.28.9" "@walmart/moment-walmart": "npm:1.0.4"
chore(test): fixed tests and corrected version geolocation
chore(test): fixed tests and corrected version geolocation
bef59d85dcf59dcee5ab864e67e26380d6051ba8
--- __tests__/navigation/AssociateHallwayNav/SideMenuContentTest.tsx @@ -105,7 +105,7 @@ describe('SideMenuContent', () => { mockUseSelector.mockReturnValueOnce({data: null}); // clock state mockUseSelector.mockReturnValueOnce(navConfig); // nav config mockUseState.mockReturnValueOnce([false, setShowDialog]); - mockUseState.mockReturnValueOnce([[], setNavConfig]); + mockUseState.mockReturnValueOnce([undefined, setNavConfig]); const component = create(<SideMenuContent {...baseProps} />); it('matches snapshot with not user/clockstatus data; sets bar style for closed', () => { @@ -121,7 +121,7 @@ describe('SideMenuContent', () => { mockUseSelector.mockReturnValueOnce(clockState); // clock state mockUseSelector.mockReturnValueOnce(navConfig); // nav config mockUseState.mockReturnValueOnce([false, setShowDialog]); - mockUseState.mockReturnValueOnce([[], setNavConfig]); + mockUseState.mockReturnValueOnce([undefined, setNavConfig]); component.update(<SideMenuContent {...baseProps} />); expect(component.toJSON()).toMatchSnapshot(); @@ -205,43 +205,11 @@ describe('SideMenuContent', () => { mockUseCanImpersonate.mockReturnValue(true); mockUseSelector.mockReturnValueOnce(undefined); mockUseSelector.mockReturnValueOnce(clockState); - mockUseSelector.mockReturnValueOnce(undefined); // nav config + mockUseSelector.mockReturnValueOnce(navConfig); mockUseState.mockReturnValueOnce([false, setShowDialog]); - mockUseState.mockReturnValueOnce([[], setNavConfig]); - - const sideMenu = create(<SideMenuContent {...baseProps} />); - expect(sideMenu.toJSON()).toMatchSnapshot(); - expect(setNavConfig).toHaveBeenCalledWith([ - { - menuType: 'SUBMENU', - icon: 'settings', - title: 'menu.settings', - enabled: true, - action: { - type: 'NAVIGATE', - value: 'Settings', - }, - }, - { - menuType: 'SUBMENU', - icon: 'feedback', - title: 'menu.feedback', - enabled: true, - action: { - type: 'NAVIGATE', - value: 'Feedback', - }, - }, - { - menuType: 'SUBMENU', - icon: 'rocket', - title: 'menu.whatsNew', - enabled: true, - action: { - type: 'NAVIGATE', - value: 'WhatsNew', - }, - }, - ]); //default config + mockUseState.mockReturnValueOnce([navConfig, setNavConfig]); + + component.update(<SideMenuContent {...baseProps} />); + expect(component.toJSON()).toMatchSnapshot(); }); }); --- __tests__/navigation/AssociateHallwayNav/__snapshots__/SideMenuContentTest.tsx.snap @@ -15,7 +15,30 @@ exports[`SideMenuContent matches snapshot for undefined user info, and can imper defaultLocale="en-US" developersText="impersonation.developers" enableDevelopersOption={true} - globalNavConfig={Array []} + globalNavConfig={ + Array [ + Object { + "action": Object { + "type": "NAVIGATE", + "value": "Settings", + }, + "enabled": true, + "icon": "settings", + "menuType": "SUBMENU", + "title": "Settings", + }, + Object { + "action": Object { + "type": "NAVIGATE", + "value": "Feedback", + }, + "enabled": true, + "icon": "feedback", + "menuType": "SUBMENU", + "title": "Give feedback", + }, + ] + } locale="en-US" navigate={[Function]} onDevelopersOptionClick={[Function]} @@ -60,7 +83,40 @@ exports[`SideMenuContent matches snapshot with not user/clockstatus data; sets b defaultLocale="en-US" developersText="impersonation.developers" enableDevelopersOption={false} - globalNavConfig={Array []} + globalNavConfig={ + Array [ + Object { + "action": Object { + "type": "NAVIGATE", + "value": "Settings", + }, + "enabled": true, + "icon": "settings", + "menuType": "SUBMENU", + "title": "menu.settings", + }, + Object { + "action": Object { + "type": "NAVIGATE", + "value": "Feedback", + }, + "enabled": true, + "icon": "feedback", + "menuType": "SUBMENU", + "title": "menu.feedback", + }, + Object { + "action": Object { + "type": "NAVIGATE", + "value": "WhatsNew", + }, + "enabled": true, + "icon": "rocket", + "menuType": "SUBMENU", + "title": "menu.whatsNew", + }, + ] + } locale="en-US" navigate={[Function]} onDevelopersOptionClick={[Function]} @@ -105,7 +161,40 @@ exports[`SideMenuContent matches snapshot with user/clockstatus data; sets bar s defaultLocale="en-US" developersText="impersonation.developers" enableDevelopersOption={false} - globalNavConfig={Array []} + globalNavConfig={ + Array [ + Object { + "action": Object { + "type": "NAVIGATE", + "value": "Settings", + }, + "enabled": true, + "icon": "settings", + "menuType": "SUBMENU", + "title": "menu.settings", + }, + Object { + "action": Object { + "type": "NAVIGATE", + "value": "Feedback", + }, + "enabled": true, + "icon": "feedback", + "menuType": "SUBMENU", + "title": "menu.feedback", + }, + Object { + "action": Object { + "type": "NAVIGATE", + "value": "WhatsNew", + }, + "enabled": true, + "icon": "rocket", + "menuType": "SUBMENU", + "title": "menu.whatsNew", + }, + ] + } locale="en-US" navigate={[Function]} onDevelopersOptionClick={[Function]} --- src/navigation/AssociateHallwayNav/SideMenuContent.tsx @@ -42,6 +42,7 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps< const remoteNavConfig = useSelector(getNavConfig); const [showDialog, setShowDialog] = useState(false); + const [navConfig, setNavConfig] = useState(undefined); const defaultConfig = [ { @@ -76,14 +77,14 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps< }, ]; - const [navConfig, setNavConfig] = useState(defaultConfig); - useEffect(() => { if (isDrawerOpen) { StatusBar.setBarStyle('dark-content', true); } else { StatusBar.setBarStyle('light-content', true); - setNavConfig(remoteNavConfig?.length ? remoteNavConfig : defaultConfig); + if (remoteNavConfig?.length && !navConfig) { + setNavConfig(remoteNavConfig); + } } // eslint-disable-next-line react-hooks/exhaustive-deps }, [isDrawerOpen]); @@ -132,7 +133,7 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps< showDefaultNav clockIn={clockStatus?.clockStatus !== ClockStatus.clockedOut} onDrawerClose={onDrawerClose} - globalNavConfig={navConfig} + globalNavConfig={navConfig || defaultConfig} user={user || {displayName: ''}} siteId={user?.siteId || 0} onSignOut={showSignOutDialog}
Logic and test update
Logic and test update
3217d5b6d167e8a8165cf70eee6406ce1197e1fe
--- packages/allspark-foundation/src/GlobalElements/context.tsx @@ -192,7 +192,7 @@ export const createGlobalElement = ( navigation.addListener('blur', onBlur), navigation.addListener('beforeRemove', onBeforeRemove), ]; - + onFocus(); return () => subs.forEach((unsub) => unsub()); // eslint-disable-next-line react-hooks/exhaustive-deps }, [JSON.stringify(config)]);
fix: globalelementsfix (#426)
fix: globalelementsfix (#426)