commit_hash
stringlengths
40
40
input
stringlengths
13
7.99k
output
stringlengths
5
155
full_message
stringlengths
6
8.96k
d419d8ef0dbd912a46bece6ab170139ccc7bb962
--- package-lock.json @@ -82,7 +82,7 @@ "@walmart/settings-mini-app": "1.12.0", "@walmart/shelfavailability-mini-app": "1.5.11", "@walmart/taskit-mini-app": "0.49.6", - "@walmart/time-clock-mini-app": "2.9.0", + "@walmart/time-clock-mini-app": "2.10.0", "@walmart/ui-components": "1.9.0", "@walmart/welcomeme-mini-app": "0.73.0", "@walmart/wfm-ui": "0.2.26", @@ -6120,9 +6120,9 @@ } }, "node_modules/@walmart/time-clock-mini-app": { - "version": "2.9.0", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.9.0.tgz", - "integrity": "sha512-BvodUL9zOFxxEJc8837FdYDTfD1MI0uwyb5Yb5OgiHHALNVbb7gh9Z0dilL25vt67LIHqbi83CsQLKY2qcOyXg==", + "version": "2.10.0", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.10.0.tgz", + "integrity": "sha512-YiF9GwKZBR+Yw2OSEYlPqJlylJ0Bk+WEqg6PvTtYRenhOeXXa7tGpRb5IDquwaCd1DkEYcINXfT3sKxTN7Z7Eg==", "hasInstallScript": true, "license": "UNLICENSED", "dependencies": { @@ -25663,9 +25663,9 @@ } }, "@walmart/time-clock-mini-app": { - "version": "2.9.0", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.9.0.tgz", - "integrity": "sha512-BvodUL9zOFxxEJc8837FdYDTfD1MI0uwyb5Yb5OgiHHALNVbb7gh9Z0dilL25vt67LIHqbi83CsQLKY2qcOyXg==", + "version": "2.10.0", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.10.0.tgz", + "integrity": "sha512-YiF9GwKZBR+Yw2OSEYlPqJlylJ0Bk+WEqg6PvTtYRenhOeXXa7tGpRb5IDquwaCd1DkEYcINXfT3sKxTN7Z7Eg==", "requires": { "@react-navigation/elements": "^1.3.1", "moment-timezone": "0.5.33", --- package.json @@ -124,7 +124,7 @@ "@walmart/settings-mini-app": "1.12.0", "@walmart/shelfavailability-mini-app": "1.5.2", "@walmart/taskit-mini-app": "0.49.6", - "@walmart/time-clock-mini-app": "2.9.0", + "@walmart/time-clock-mini-app": "2.10.0", "@walmart/ui-components": "1.9.0", "@walmart/welcomeme-mini-app": "0.73.0", "@walmart/wfm-ui": "0.2.26",
Update time clock to 2.10.0
Update time clock to 2.10.0
98fe48c4b7a22be85ad95ff6c9160aeb7a0959f2
--- package-lock.json @@ -3228,9 +3228,9 @@ "integrity": "sha512-R+Kkr3KRExpa59xqPkVPF66+zGo88oZiqbfFx+BzrIJE6eUTUKTGCeiidVci+xjmfSnp6TKrMUkRBxh2b/GffA==" }, "@walmart/time-clock-mini-app": { - "version": "0.1.48", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.1.48.tgz", - "integrity": "sha512-K0iAhtaBzJhVCOqVyZ2Q1HTcFGDg+i+yup+qWNoFiCqTM2I0dR/Lx07MikGQnwrCw6HrNOGbzN4FD4hQhrJVNQ==", + "version": "0.1.50", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.1.50.tgz", + "integrity": "sha512-dP5U/wZ+slWTRiL7ci7d5WyQdYdvq087nApUXK4kndpB31UvcN3JWe0EuHjHrx/oE+xKges4c5rMGEOwIT/SeQ==", "requires": { "@react-native-community/datetimepicker": "^3.0.3", "javascript-time-ago": "^2.3.4", --- package.json @@ -77,7 +77,7 @@ "@walmart/redux-store": "^1.0.12", "@walmart/schedule-mini-app": "0.2.65", "@walmart/settings-mini-app": "1.1.20", - "@walmart/time-clock-mini-app": "0.1.48", + "@walmart/time-clock-mini-app": "0.1.50", "@walmart/ui-components": "1.0.100", "@walmart/welcomeme-mini-app": "0.5.27", "crypto-js": "^3.3.0",
Splunk and minor API change to time clock mini app (#436)
Splunk and minor API change to time clock mini app (#436) Co-authored-by: Hitesh Arora - h0a006n <Hitesh.Arora@walmart.com>
e9a40369a5e894de760e6e4231e6c00fe9fc1c03
--- packages/allspark-foundation-hub/src/Core/index.ts @@ -6,4 +6,5 @@ LogBox.ignoreLogs([/ReactNativeSumoSdk requires main queue setup/]); export * from '../HubFeature'; export * from '../HubFeature/Store'; +export * from '../HubFeature/Shared/Components'; export * from '../HubFeature/SupplyChain';
feat(ui): exported error screen
feat(ui): exported error screen
0dea2ebdcede9c4d923757d84be6771f0863e3a9
--- package.json @@ -222,7 +222,7 @@ "react-native-error-boundary": "^1.1.6", "react-native-fs": "^2.18.0", "react-native-geolocation-service": "^5.3.1", - "react-native-gesture-handler": "~2.20.2", + "react-native-gesture-handler": "~2.25.0", "react-native-get-random-values": "~1.11.0", "react-native-haptic-feedback": "^1.14.0", "react-native-html-parser": "^0.1.0", --- yarn.lock @@ -7750,7 +7750,7 @@ __metadata: react-native-error-boundary: "npm:^1.1.6" react-native-fs: "npm:^2.18.0" react-native-geolocation-service: "npm:^5.3.1" - react-native-gesture-handler: "npm:~2.20.2" + react-native-gesture-handler: "npm:~2.25.0" react-native-get-random-values: "npm:~1.11.0" react-native-haptic-feedback: "npm:^1.14.0" react-native-html-parser: "npm:^0.1.0" @@ -19164,18 +19164,17 @@ __metadata: languageName: node linkType: hard -"react-native-gesture-handler@npm:~2.20.2": - version: 2.20.2 - resolution: "react-native-gesture-handler@npm:2.20.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Freact-native-gesture-handler%2F-%2Freact-native-gesture-handler-2.20.2.tgz" +"react-native-gesture-handler@npm:~2.25.0": + version: 2.25.0 + resolution: "react-native-gesture-handler@npm:2.25.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Freact-native-gesture-handler%2F-%2Freact-native-gesture-handler-2.25.0.tgz" dependencies: "@egjs/hammerjs": "npm:^2.0.17" hoist-non-react-statics: "npm:^3.3.0" invariant: "npm:^2.2.4" - prop-types: "npm:^15.7.2" peerDependencies: react: "*" react-native: "*" - checksum: 10c0/94c16a40370adfaaff8af6aec5938a8d5c5704afaf7ec569d9e11c66ecc3b5c763314c091a76573885636c04d9e6084de3696d59595c56aac9eb17b2f28e5c6c + checksum: 10c0/95eccc67fb07418ef76b84bcee4b29c16865e78afa367ec82d94b08554cfa7337158ab23937b785bd9a732e62c9c815b294a93d1b2c2cbdc7a8a1e7029f2ba35 languageName: node linkType: hard
fix(gesture): ALLSPARK-5912 updated react-native-gesture-recognizer package
fix(gesture): ALLSPARK-5912 updated react-native-gesture-recognizer package
5ab10eb87f2dab75f1eaa01a10ecba687dfffdca
--- packages/me-at-walmart-container/src/services/site/fetchSiteInfo.ts @@ -26,25 +26,25 @@ export const fetchSiteInfo = async ( }, ); if (status === 200) { - MeAtWalmartLoggerService.getContainerInstance().debug( + MeAtWalmartLoggerService.getContainerInstance().info( 'Successfully fetched store configs from bff.', { - storeNumber, + siteId: storeNumber, }, ); return data; } - MeAtWalmartLoggerService.getContainerInstance().warn( + MeAtWalmartLoggerService.getContainerInstance().info( 'No configs exist for this store in bff.', { - storeNumber, + siteId: storeNumber, }, ); } catch (e) { MeAtWalmartLoggerService.getContainerInstance().error( 'Unable to fetch store configs from bff.', { - storeNumber, + siteId: storeNumber, message: (e as Error).message, }, ); --- packages/me-at-walmart-container/src/services/site/querySiteInfo.ts @@ -63,10 +63,10 @@ export const querySiteInfo = async ( ttl: 1000 * 60 * 60 * 24 * 7, // 1 week }, ); - MeAtWalmartLoggerService.getContainerInstance().debug( + MeAtWalmartLoggerService.getContainerInstance().info( 'Successfully fetched store configs from athena.', { - site, + siteId: site, }, ); @@ -76,7 +76,7 @@ export const querySiteInfo = async ( 'Failed to fetch store configs from athena', { message: (error as Error).message, - site, + siteId: site, countryCode, }, );
fix(fetchsiteinfo and querysiteinfo): ALLSPARK-4182 changing to info log (#4054)
fix(fetchsiteinfo and querysiteinfo): ALLSPARK-4182 changing to info log (#4054) * fix(fetchsiteinfo and querysiteinfo): ALLSPARK-4182 changing to info log * fix(fetchsiteinfo and querysiteinfo): ALLSPARK-4182 change logs: siteid
b1a2e2349110c3792ee2ef253ff8dd0ba106e72a
--- .looper.multibranch.yml @@ -258,7 +258,7 @@ flows: ## temp - npm install - | - #!/bin/sh + #!/bin/sh -x cd ./scripts node sendToTeams.js --webhookUrl https://walmart.webhook.office.com/webhookb2/f0470775-130f-4a42-9531-d0511cf632aa@3cbcc3d3-094d-4006-9849-0d11d61f484d/IncomingWebhook/16391a60331c4d4999f112e40a0b2db1/f02e8323-deff-42c4-85df-613f84ca35ff \
testing
testing
fa2f427e26f3109a92c9a8e8cc2ea246f821d2d8
--- packages/celebration-mini-app-graphql/CHANGELOG.md @@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.29.0](https://gecgithub01.walmart.com/smdv/celebration-mini-app/compare/@walmart/celebration-mini-app-graphql@1.28.5...@walmart/celebration-mini-app-graphql@1.29.0) (2025-12-22) + +### Features + +- **ui:** update store change functionality ([9f7c0a4](https://gecgithub01.walmart.com/smdv/celebration-mini-app/commit/9f7c0a43cd4f47cc38edbf799cbe4a9dfad83aec)) +- **ui:** update store change functionality ([ed28ce7](https://gecgithub01.walmart.com/smdv/celebration-mini-app/commit/ed28ce7ccffaa7c9633e6cfc92981f21a5643f6c)) + ## [1.28.5](https://gecgithub01.walmart.com/smdv/celebration-mini-app/compare/@walmart/celebration-mini-app-graphql@1.28.4...@walmart/celebration-mini-app-graphql@1.28.5) (2025-12-19) **Note:** Version bump only for package @walmart/celebration-mini-app-graphql --- packages/celebration-mini-app-graphql/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/celebration-mini-app-graphql", - "version": "1.28.5", + "version": "1.29.0", "packageManager": "yarn@4.6.0", "engines": { "node": ">=18" --- packages/celebration-mini-app/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.41.0](https://gecgithub01.walmart.com/smdv/celebration-mini-app/compare/@walmart/celebration-mini-app@1.40.0...@walmart/celebration-mini-app@1.41.0) (2025-12-22) + +### Features + +- **ui:** update store change functionality ([9f7c0a4](https://gecgithub01.walmart.com/smdv/celebration-mini-app/commit/9f7c0a43cd4f47cc38edbf799cbe4a9dfad83aec)) +- **ui:** update store change functionality ([ed28ce7](https://gecgithub01.walmart.com/smdv/celebration-mini-app/commit/ed28ce7ccffaa7c9633e6cfc92981f21a5643f6c)) +- **ui:** update store change functionality and tests ([657ca8a](https://gecgithub01.walmart.com/smdv/celebration-mini-app/commit/657ca8a7cf54440aac2556c4b184761cd59e733b)) + # [1.40.0](https://gecgithub01.walmart.com/smdv/celebration-mini-app/compare/@walmart/celebration-mini-app@1.39.1...@walmart/celebration-mini-app@1.40.0) (2025-12-19) ### Features --- packages/celebration-mini-app/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/celebration-mini-app", - "version": "1.40.0", + "version": "1.41.0", "packageManager": "yarn@4.6.0", "engines": { "node": ">=18"
chore(version): updating package version
chore(version): updating package version - @walmart/celebration-mini-app@1.41.0 - @walmart/celebration-mini-app-graphql@1.29.0
6e54114cf267699c2a1acc8334686279ddce83c6
--- 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.11", + "@walmart/receipt-check-miniapp": "1.9.12", "@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.11", - "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.9.11.tgz", - "integrity": "sha512-DvUnh4c68PSXcSvfdzAfW1sB3mxUF9K9OvkZwN4seJK6S7/4I7RgdXr/AX4ET2iLXAZIfXYoiuScojHwPkR1/g==", + "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==", "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.11", - "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.9.11.tgz", - "integrity": "sha512-DvUnh4c68PSXcSvfdzAfW1sB3mxUF9K9OvkZwN4seJK6S7/4I7RgdXr/AX4ET2iLXAZIfXYoiuScojHwPkR1/g==", + "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==", "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.11", + "@walmart/receipt-check-miniapp": "1.9.12", "@walmart/redux-store": "3.1.3", "@walmart/returns-mini-app": "0.12.0", "@walmart/schedule-mini-app": "0.33.0",
version bump for flow fix
version bump for flow fix
e7c027191bd2e20aeb81ef42bab77d7a82363bcf
--- targets/US/package.json @@ -149,7 +149,7 @@ "@walmart/shop-gnfr-mini-app": "1.0.137", "@walmart/sidekick-mini-app": "4.168.19", "@walmart/store-feature-orders": "1.27.9", - "@walmart/taskit-mini-app": "5.26.5", + "@walmart/taskit-mini-app": "5.26.6", "@walmart/time-clock-mini-app": "2.448.1", "@walmart/topstock-mini-app": "1.20.4", "@walmart/translator-mini-app": "1.4.2", --- yarn.lock @@ -7352,7 +7352,7 @@ __metadata: "@walmart/shop-gnfr-mini-app": "npm:1.0.137" "@walmart/sidekick-mini-app": "npm:4.168.19" "@walmart/store-feature-orders": "npm:1.27.9" - "@walmart/taskit-mini-app": "npm:5.26.5" + "@walmart/taskit-mini-app": "npm:5.26.6" "@walmart/time-clock-mini-app": "npm:2.448.1" "@walmart/topstock-mini-app": "npm:1.20.4" "@walmart/translator-mini-app": "npm:1.4.2" @@ -8290,12 +8290,12 @@ __metadata: languageName: node linkType: hard -"@walmart/taskit-mini-app@npm:5.26.5": - version: 5.26.5 - resolution: "@walmart/taskit-mini-app@npm:5.26.5" +"@walmart/taskit-mini-app@npm:5.26.6": + version: 5.26.6 + resolution: "@walmart/taskit-mini-app@npm:5.26.6" peerDependencies: "@walmart/allspark-foundation": "*" - checksum: 10c0/c4f4fa5543f811a74657dd720705419a6518755e6898bca96a2abbb38c6cf0fa0ef44aa1fbcbaee2308f11f06a5aa467eb8f3642a481396c63fd3e743437a37a + checksum: 10c0/523d7dcec331390df6e4b880de55662974a1e8c6a58a219da3ad8ebfc903c3f9ef55fc02a33fca4f9a54afb940d2b4832b8d5d9a555e05f6f8e4c901a047b05f languageName: node linkType: hard
chore: bump taskit-mini-app@5.26.6
chore: bump taskit-mini-app@5.26.6
1221851484fffe52eb0c61fae6525fd4f7f0b502
--- graphql.yml @@ -1,29 +1,24 @@ schemaVersion: '1.0.0' -teamRostersProductId: 111 +teamRostersProductId: 2071 +notify: + slack: + channelName: 'ask-sam-automaton-test' applications: - - name: 'ME_AT_WALMART' - applicationKey: 'ME_AT_WALMART' + - name: 'allspark-core' + applicationKey: 'ALLSPARK_APP' description: 'Core application for Me@Walmart' environments: - - name: 'dev' + - name: 'stg' persistedQueries: - name: 'getLoggedInUser' hash: '39bcb15f7a2aee1e2198b8544271ca9a99079e146ec093555f5b4ec2eb47c420' queryTemplate: 'packages/core-services-allspark/graphql/queries/getLoggedInUser.graphql' tags: - - 'v1' - - 'v1' - - name: 'stage' - persistedQueries: - - name: 'getLoggedInUser' - hash: '39bcb15f7a2aee1e2198b8544271ca9a99079e146ec093555f5b4ec2eb47c420' - queryTemplate: 'packages/core-services-allspark/graphql/queries/getLoggedInUser.graphql' - tags: - - 'v1' + - 'v2' - name: 'prod' persistedQueries: - name: 'getLoggedInUser' hash: '39bcb15f7a2aee1e2198b8544271ca9a99079e146ec093555f5b4ec2eb47c420' queryTemplate: 'packages/core-services-allspark/graphql/queries/getLoggedInUser.graphql' tags: - - 'v1' + - 'v2'
Update graphql.yml
Update graphql.yml
2502406d118c767f9333242e1198bd6faeadbf6d
--- package.json @@ -161,7 +161,7 @@ "@walmart/sidekick-mini-app": "4.231.0", "@walmart/store-feature-orders": "1.34.7", "@walmart/talent-preboarding-mini-app": "1.0.41", - "@walmart/taskit-mini-app": "5.42.0", + "@walmart/taskit-mini-app": "5.42.18", "@walmart/time-clock-mini-app": "3.19.6", "@walmart/time-clock-mini-app-next": "3.0.0", "@walmart/topstock-mini-app": "1.27.1", --- yarn.lock @@ -8378,7 +8378,7 @@ __metadata: "@walmart/sidekick-mini-app": "npm:4.231.0" "@walmart/store-feature-orders": "npm:1.34.7" "@walmart/talent-preboarding-mini-app": "npm:1.0.41" - "@walmart/taskit-mini-app": "npm:5.42.0" + "@walmart/taskit-mini-app": "npm:5.42.18" "@walmart/time-clock-mini-app": "npm:3.19.6" "@walmart/time-clock-mini-app-next": "npm:3.0.0" "@walmart/topstock-mini-app": "npm:1.27.1" @@ -9282,12 +9282,12 @@ __metadata: languageName: node linkType: hard -"@walmart/taskit-mini-app@npm:5.42.0": - version: 5.42.0 - resolution: "@walmart/taskit-mini-app@npm:5.42.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ftaskit-mini-app%2F-%2F%40walmart%2Ftaskit-mini-app-5.42.0.tgz" +"@walmart/taskit-mini-app@npm:5.42.18": + version: 5.42.18 + resolution: "@walmart/taskit-mini-app@npm:5.42.18::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ftaskit-mini-app%2F-%2F%40walmart%2Ftaskit-mini-app-5.42.18.tgz" peerDependencies: "@walmart/allspark-foundation": "*" - checksum: 10c0/24afda1fb8b894c988b122f53654327c5910d1f5c5bb2672bb739d8c867c483a0ff2356129cf48f6f385f84b22b4ad45696b124857d0a15d804e96b6177844c6 + checksum: 10c0/bc50634a8a82e2a099dd7c8e3be5c9c71d910161cf1182b7ed699004647b4a23ffd819bbbc9c51bd876fabbcf7d57847466f572eb1fd37581dd58af56c59c1a1 languageName: node linkType: hard
feat: adding notes safety
feat: adding notes safety
05cdfded78cdcc4c67996b91327c8c92abc7ccd1
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "3.8.0", + "version": "3.8.1", "main": "dist/index.js", "files": [ "dist", @@ -89,7 +89,7 @@ "@walmart/react-native-scanner-3.0": "0.10.4", "@walmart/react-native-sumo-sdk": "2.8.0", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "3.7.0", + "@walmart/wmconnect-mini-app": "3.7.1", "babel-jest": "^29.6.3", "chance": "^1.1.11", "crypto-js": "~4.2.0",
feat(ada): update version
feat(ada): update version
251fe830c9d6d43eba20c96aca4c03724eedee87
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "3.15.0", + "version": "3.15.1", "main": "dist/index.js", "files": [ "dist", @@ -91,7 +91,7 @@ "@walmart/react-native-scanner-3.0": "patch:@walmart/react-native-scanner-3.0@npm%3A0.15.8#~/.yarn/patches/@walmart-react-native-scanner-3.0-npm-0.15.8-6fb92a01bb.patch", "@walmart/react-native-sumo-sdk": "patch:@walmart/react-native-sumo-sdk@npm%3A2.8.0#~/.yarn/patches/@walmart-react-native-sumo-sdk-npm-2.8.0-31dfe1d845.patch", "@walmart/ui-components": "1.26.3-423-05e66f8", - "@walmart/wmconnect-mini-app": "3.8.0", + "@walmart/wmconnect-mini-app": "3.8.1", "babel-jest": "^29.6.3", "chance": "^1.1.11", "crypto-js": "~4.2.0", --- yarn.lock @@ -8583,7 +8583,7 @@ __metadata: "@walmart/react-native-scanner-3.0": "patch:@walmart/react-native-scanner-3.0@npm%3A0.15.8#~/.yarn/patches/@walmart-react-native-scanner-3.0-npm-0.15.8-6fb92a01bb.patch" "@walmart/react-native-sumo-sdk": "patch:@walmart/react-native-sumo-sdk@npm%3A2.8.0#~/.yarn/patches/@walmart-react-native-sumo-sdk-npm-2.8.0-31dfe1d845.patch" "@walmart/ui-components": "npm:1.26.3-423-05e66f8" - "@walmart/wmconnect-mini-app": "npm:3.8.0" + "@walmart/wmconnect-mini-app": "npm:3.8.1" babel-jest: "npm:^29.6.3" chance: "npm:^1.1.11" crypto-js: "npm:~4.2.0" @@ -8674,9 +8674,9 @@ __metadata: languageName: node linkType: hard -"@walmart/wmconnect-mini-app@npm:3.8.0": - version: 3.8.0 - resolution: "@walmart/wmconnect-mini-app@npm:3.8.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.8.0.tgz" +"@walmart/wmconnect-mini-app@npm:3.8.1": + version: 3.8.1 + resolution: "@walmart/wmconnect-mini-app@npm:3.8.1::__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.8.1.tgz" peerDependencies: "@walmart/allspark-foundation": ">=7.12.0" expo: ~53.0.20 @@ -8687,7 +8687,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/0248399c5505154292b79e49f46e8324f9c75b86649aa6359e15e2a5305d5d9fc2a995e60d63c88788bcd794ad912d6bafe10f9f90a767f49208d730ec7c2392 + checksum: 10c0/39c4c1b1bacf22c50d5d23067d41d22497d0b31dd60b6c32eac97b36f9b653dbf228b32f6f7174dc27c72a46f1456616382b5fa706e3a2f19abb0328cca71d2c languageName: node linkType: hard
feat(ui): update wmconnect and roster version
feat(ui): update wmconnect and roster version
58f008f01506afc5aed01d54829ef89d1b3211d2
--- package-lock.json @@ -60,7 +60,7 @@ "@walmart/emergency-mini-app": "1.27.0", "@walmart/exception-mini-app": "1.7.4", "@walmart/facilities-management-miniapp": "0.8.1", - "@walmart/feedback-all-spark-miniapp": "0.9.58", + "@walmart/feedback-all-spark-miniapp": "0.9.59", "@walmart/financial-wellbeing-feature-app": "1.20.1", "@walmart/functional-components": "6.0.2", "@walmart/gta-react-native-calendars": "0.6.0", @@ -11382,9 +11382,9 @@ } }, "node_modules/@walmart/feedback-all-spark-miniapp": { - "version": "0.9.58", - "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.9.58.tgz", - "integrity": "sha512-3Aep7kY/YbP4Io6VwMNXDfmXZYv0gPRq6PzaV+dMqCEeoRYGny/NuE1k8azgtWOmnOMQDRpJIPZHLFIdLM0TTw==", + "version": "0.9.59", + "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.9.59.tgz", + "integrity": "sha512-Oyo3yPh0iPr8lm2z2/RbSMIPmRce1F6400gg1VGO2qauIl0VsoZjvEm2Gnj2vLF2OAb9REabcEIUSVFa9siCEw==", "peerDependencies": { "@react-native-async-storage/async-storage": "^1.19.0", "@react-native-community/datetimepicker": "^6.1.3", @@ -11392,7 +11392,7 @@ "@react-navigation/native": "^6.0.0", "@react-navigation/stack": "^6.1.0", "@walmart/core-services": "~2.0.19", - "@walmart/gtp-shared-components": "2.1.3", + "@walmart/gtp-shared-components": "2.1.9", "@walmart/impersonation-mini-app": "1.18.3", "@walmart/react-native-logger": "1.34.7", "@walmart/react-native-shared-navigation": "1.0.2", --- package.json @@ -101,7 +101,7 @@ "@walmart/emergency-mini-app": "1.27.0", "@walmart/exception-mini-app": "1.7.4", "@walmart/facilities-management-miniapp": "0.8.1", - "@walmart/feedback-all-spark-miniapp": "0.9.58", + "@walmart/feedback-all-spark-miniapp": "0.9.59", "@walmart/financial-wellbeing-feature-app": "1.20.1", "@walmart/functional-components": "6.0.2", "@walmart/gta-react-native-calendars": "0.6.0",
GDVCVR-16204 Drop 20 Feedback mini app changes
GDVCVR-16204 Drop 20 Feedback mini app changes
a32829dfd36d217e52d2d865fd21dbbc6990a655
--- packages/allspark-foundation/__tests__/Components/context.test.tsx @@ -3,7 +3,7 @@ import { render } from '@testing-library/react-native'; import { AllsparkComponentProvider, useAllsparkImage } from '../../src/Components/context'; describe('AllsparkComponentContext', () => { - it('uses default Image component when not overridden', () => { + it('test context library', () => { const TestComponent = () => { const AllsparkImage = useAllsparkImage(); return <AllsparkImage source={{ uri: 'default-image-uri' }} testID="DefaultImage" />;
code cleanup
code cleanup
df894692c0fa44c68b1c9692624bf631eb51cbd1
--- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/roster-mini-app", - "version": "1.0.17-alpha-4", + "version": "1.0.17-alpha-5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/roster-mini-app", - "version": "1.0.17-alpha-4", + "version": "1.0.17-alpha-5", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.20.0", @@ -67,7 +67,7 @@ "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "3.7.0", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "1.0.16-alpha-5", + "@walmart/wmconnect-mini-app": "1.0.16-alpha-6", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", @@ -11836,9 +11836,9 @@ } }, "node_modules/@walmart/wmconnect-mini-app": { - "version": "1.0.16-alpha-5", - "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.16-alpha-5.tgz", - "integrity": "sha512-SSY8Ww9Z0w6AjNBKVtW+H+9B0KeocqCccjpZDBHqE1IuZ/Pw47P2kwRsKlezB6VH5agd83Xv3mX8h+CjY1vGCA==", + "version": "1.0.16-alpha-6", + "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.16-alpha-6.tgz", + "integrity": "sha512-azElIaNmfytxl6pWyb28agNksCP7zOtSgxlJvTYrqNZLvaJT45C1uodGOdRIYcPu/tbAlUZlNNcHi/R2rYFQNg==", "dev": true, "hasInstallScript": true }, @@ -41047,9 +41047,9 @@ } }, "@walmart/wmconnect-mini-app": { - "version": "1.0.16-alpha-5", - "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.16-alpha-5.tgz", - "integrity": "sha512-SSY8Ww9Z0w6AjNBKVtW+H+9B0KeocqCccjpZDBHqE1IuZ/Pw47P2kwRsKlezB6VH5agd83Xv3mX8h+CjY1vGCA==", + "version": "1.0.16-alpha-6", + "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.16-alpha-6.tgz", + "integrity": "sha512-azElIaNmfytxl6pWyb28agNksCP7zOtSgxlJvTYrqNZLvaJT45C1uodGOdRIYcPu/tbAlUZlNNcHi/R2rYFQNg==", "dev": true }, "@whatwg-node/events": { --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "1.0.17-alpha-4", + "version": "1.0.17-alpha-5", "private": false, "main": "dist/index.js", "files": [ @@ -90,7 +90,7 @@ "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "3.7.0", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "1.0.16-alpha-5", + "@walmart/wmconnect-mini-app": "1.0.16-alpha-6", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0",
Update version
Update version
ee70e61efe0a6d469a2fad62df03bbed8595584f
--- graphql.yml @@ -11,11 +11,11 @@ applications: - name: "GetAssociateClockStatus" queryTemplate: "src/queries/getAssociateClockStatus.graphql" tags: - - "v2" + - "v1" - name: "GetAssociateName" queryTemplate: "src/queries/getAssociateName.graphql" tags: - - "v2" + - "v1" - name: "GetDailyRoster" queryTemplate: "src/queries/getDailyRoster.graphql" tags: @@ -31,21 +31,21 @@ applications: - name: "GetTeamsByStore" queryTemplate: "src/queries/getTeamsbyStore.graphql" tags: - - "v2" + - "v1" - name: "upsertAssociateTextPreferences" queryTemplate: "src/queries/upsertAssociateTextPreference.graphql" tags: - - "v2" + - "v1" - name: "stage" persistedQueries: - name: "GetAssociateClockStatus" queryTemplate: "src/queries/getAssociateClockStatus.graphql" tags: - - "v2" + - "v1" - name: "GetAssociateName" queryTemplate: "src/queries/getAssociateName.graphql" tags: - - "v2" + - "v1" - name: "GetDailyRoster" queryTemplate: "src/queries/getDailyRoster.graphql" tags: @@ -61,21 +61,21 @@ applications: - name: "GetTeamsByStore" queryTemplate: "src/queries/getTeamsbyStore.graphql" tags: - - "v2" + - "v1" - name: "upsertAssociateTextPreferences" queryTemplate: "src/queries/upsertAssociateTextPreference.graphql" tags: - - "v2" + - "v1" # - name: "prod" # persistedQueries: # - name: "GetAssociateClockStatus" # queryTemplate: "src/queries/getAssociateClockStatus.graphql" # tags: - # - "v2" + # - "v1" # - name: "GetAssociateName" # queryTemplate: "src/queries/getAssociateName.graphql" # tags: - # - "v2" + # - "v1" # - name: "GetDailyRoster" # queryTemplate: "src/queries/getDailyRoster.graphql" # tags: @@ -91,8 +91,8 @@ applications: # - name: "GetTeamsByStore" # queryTemplate: "src/queries/getTeamsbyStore.graphql" # tags: - # - "v2" + # - "v1" # - name: "upsertAssociateTextPreferences" # queryTemplate: "src/queries/upsertAssociateTextPreference.graphql" # tags: - # - "v2" + # - "v1"
update tags
update tags
8f338e48663ed83814ef1f39b065832c61f89948
--- packages/me-at-walmart-container/graphql.yml @@ -21,7 +21,7 @@ applications: tags: - 'v1' - name: 'getLoggedInUser' - hash: '6b68b67a5067dd54e92573cbbb15862f8ecae6ee722436e71a09fcdb6d2d3c34' + hash: '0beb54411dbf4e0c72d8d94982d755e0559023bc5e2c174e356b42f1e07b22fd' queryTemplate: './src/queries/getLoggedInUser.graphql' tags: - 'v1' @@ -35,6 +35,11 @@ applications: queryTemplate: './src/queries/getTeamByIdHome.graphql' tags: - 'v1' + - name: 'upsertAssociatePreference' + hash: '972c522c6ad0675f13587637cff2dd2ed46937a9878a48a66ad2bc2f7d51a036' + queryTemplate: './src/queries/updateAssociatePrivacyPreference.graphql' + tags: + - 'v1' - name: 'prod' persistedQueries: - name: 'getAssociateById' @@ -48,7 +53,7 @@ applications: tags: - 'v1' - name: 'getLoggedInUser' - hash: '6b68b67a5067dd54e92573cbbb15862f8ecae6ee722436e71a09fcdb6d2d3c34' + hash: '0beb54411dbf4e0c72d8d94982d755e0559023bc5e2c174e356b42f1e07b22fd' queryTemplate: './src/queries/getLoggedInUser.graphql' tags: - 'v1' @@ -62,3 +67,8 @@ applications: queryTemplate: './src/queries/getTeamByIdHome.graphql' tags: - 'v1' + - name: 'upsertAssociatePreference' + hash: '972c522c6ad0675f13587637cff2dd2ed46937a9878a48a66ad2bc2f7d51a036' + queryTemplate: './src/queries/updateAssociatePrivacyPreference.graphql' + tags: + - 'v1' --- packages/me-at-walmart-container/src/queries/getLoggedInUser.graphql @@ -10,6 +10,7 @@ query getLoggedInUser { __typename displayPreferences { __typename + anniversary birthday } } @@ -70,4 +71,4 @@ query getLoggedInUser { wmRegionNumber wmSystemJobCodes } -} \ No newline at end of file +} --- packages/me-at-walmart-container/src/queries/getLoggedInUser.ts @@ -52,6 +52,17 @@ export type GetLoggedInUserQuery = { preferredMiddleName?: string | null; preferredNameSocialSuffix?: string | null; preferredNameTitle?: string | null; + associatePreferences?: { + __typename: 'AssociatePreferences'; + meAtWalmartPreferences?: { + __typename: 'MeAtWalmartPreferences'; + displayPreferences?: { + __typename: 'DisplayPreferences'; + anniversary?: boolean | null; + birthday?: boolean | null; + } | null; + } | null; + } | null; birthDate?: { __typename: 'Birthday'; raw?: string | null } | null; teams?: Array<{ __typename: 'Team'; @@ -77,6 +88,17 @@ export const GetLoggedInUserDocument = gql` associate { __typename associateId + associatePreferences { + __typename + meAtWalmartPreferences { + __typename + displayPreferences { + __typename + anniversary + birthday + } + } + } birthDate { __typename raw --- packages/me-at-walmart-container/src/queries/updateAssociatePrivacyPreference.graphql @@ -1,13 +1,18 @@ -mutation upsertAssociatePreference($associatePreferencesInput: AssociatePreferencesInput!) { - upsertAssociatePreference(associatePreferencesInput: $associatePreferencesInput) { +mutation upsertAssociatePreference( + $associatePreferencesInput: AssociatePreferencesInput! +) { + upsertAssociatePreference( + associatePreferencesInput: $associatePreferencesInput + ) { __typename meAtWalmartPreferences { __typename displayPreferences { __typename + anniversary birthday } } walmartIdentificationNumber } -} \ No newline at end of file +} --- packages/me-at-walmart-container/src/queries/updateAssociatePrivacyPreference.ts @@ -18,6 +18,7 @@ export type UpsertAssociatePreferenceMutation = { __typename: 'MeAtWalmartPreferences'; displayPreferences?: { __typename: 'DisplayPreferences'; + anniversary?: boolean | null; birthday?: boolean | null; } | null; } | null; @@ -36,6 +37,7 @@ export const UpsertAssociatePreferenceDocument = gql` __typename displayPreferences { __typename + anniversary birthday } }
chore: update upsert preference query to match main
chore: update upsert preference query to match main
d03707a78972f4ce97f6f30f2d778e014648a6a2
--- __tests__/startup/StartupFlowTest.ts @@ -76,7 +76,7 @@ describe('candidateStartupFlow', () => { test('associateStartupFlow', () => { const iterator = associateStartupFlow(); expect(iterator.next().value).toEqual(call(handleSiteIdPrompt)); - expect(iterator.next().value).toEqual(call(waitForAppConfig)); + // expect(iterator.next().value).toEqual(call(waitForAppConfig)); expect(iterator.next().value).toEqual(call(handleTermsOfUse)); expect(iterator.next().value).toEqual(call(handlePermissions)); expect(iterator.next().value).toEqual(call(handlePinCode)); --- package-lock.json @@ -4476,9 +4476,9 @@ } }, "@walmart/allspark-home-mini-app": { - "version": "0.5.36", - "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.5.36.tgz", - "integrity": "sha512-TFbiZnfw33gmpxaecx/nEnTpYm/MDIiah69NZbhvQZAzjOIHb5+fRCwMXFXtSQIwkhKcBnULaz0dBBOMaK3/fA==", + "version": "0.5.37", + "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.5.37.tgz", + "integrity": "sha512-nx31Ak2vNipkztlqiRCM0n8++jInh6oPRGww6hCiW7LGYi4zkvObv/L4SoG6eQYrdiREAknqTeETsOpSkbHvGw==", "requires": { "moment": "^2.29.0", "uuid": "^8.3.1" --- package.json @@ -71,7 +71,7 @@ "@sharcoux/slider": "^5.2.1", "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@walmart/allspark-health-survey-mini-app": "0.0.44", - "@walmart/allspark-home-mini-app": "0.5.36", + "@walmart/allspark-home-mini-app": "0.5.37", "@walmart/allspark-neon-core": "0.1.26", "@walmart/ask-sam-mini-app": "^0.41.8", "@walmart/config-components": "3.0.2", --- src/changeStore/ChangeStoreModal.tsx @@ -111,7 +111,7 @@ export const ChangeStoreModal = (props: StackScreenProps<any>) => { const onDismiss = () => { const currentSite = storeInfo.siteId; - if (!!currentSite && currentSite !== workingSite) { + if (!!currentSite && currentSite !== workingSite && !storeInfo.error) { userActions.updateUser({siteId: currentSite, workingSite: currentSite}); telemetry.logEvent('core', 'site_changed', { from: String(workingSite), --- src/redux/SharedSelectors.ts @@ -36,6 +36,7 @@ export const getChangeStoreBannerEnabled = getCoreAppConfigValue( export const getChangeStoreModalEnabled = getCoreAppConfigValue( 'changeStoreModalEnabled', + true, ); export const getUserInfoTTL = getCoreAppConfigValue('userInfoTTL'); --- src/startup/StartupFlow.ts @@ -39,7 +39,7 @@ export function* associateStartupFlow() { // Remaining flows rely on app config. // This also indirectly waits on store config since // app config is dependent on it - yield call(waitForAppConfig); + // yield call(waitForAppConfig); // Terms of Use yield call(handleTermsOfUse);
defaulting change store enabled to true. skipping wait for app config during startup
defaulting change store enabled to true. skipping wait for app config during startup
ce378b552b5d1c62c54e2709001ce95e70fc66b5
--- yarn.lock @@ -19565,4 +19565,3 @@ __metadata: checksum: 10c0/71cc2f2bbb537300c3f569e25693d37b3bc91f225cefce251a71c30bc6bb3e7f8e9420ca0eb57f2ac9e492b085b8dfa075fd1e8195c40b83c951dd59c6e4fbf8 languageName: node linkType: hard - \ No newline at end of file
feat: removed space in yarn.lock
feat: removed space in yarn.lock
87bd17ba9af89163f74e3c1975cc89fdbca610ab
--- packages/allspark-foundation-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.25.18](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.25.17...@walmart/allspark-foundation-hub@1.25.18) (2025-12-11) + +**Note:** Version bump only for package @walmart/allspark-foundation-hub + ## [1.25.17](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.25.16...@walmart/allspark-foundation-hub@1.25.17) (2025-12-11) **Note:** Version bump only for package @walmart/allspark-foundation-hub --- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.25.17", + "version": "1.25.18", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", --- packages/allspark-foundation/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. +## [7.16.16](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.16.15...@walmart/allspark-foundation@7.16.16) (2025-12-11) + +### Bug Fixes + +- **ui:** ALLSPARK-7310 updated header padding ([#522](https://gecgithub01.walmart.com/allspark/allspark/issues/522)) ([fb3d3a7](https://gecgithub01.walmart.com/allspark/allspark/commit/fb3d3a75f2f0eafe3699606467f2cfcf17c49ed2)) + ## [7.16.15](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.16.14...@walmart/allspark-foundation@7.16.15) (2025-12-11) ### Bug Fixes --- packages/allspark-foundation/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation", - "version": "7.16.15", + "version": "7.16.16", "description": "", "main": "Core/index.js", "types": "Core/index.d.ts", --- 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.7.4](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/my-walmart-hub@1.7.3...@walmart/my-walmart-hub@1.7.4) (2025-12-11) + +**Note:** Version bump only for package @walmart/my-walmart-hub + ## [1.7.3](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/my-walmart-hub@1.7.2...@walmart/my-walmart-hub@1.7.3) (2025-12-11) **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.7.3", + "version": "1.7.4", "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/allspark-foundation@7.16.16 - @walmart/allspark-foundation-hub@1.25.18 - @walmart/my-walmart-hub@1.7.4
5adc3946c04afa7f0a28d6c97b34028cdce79fce
--- package-lock.json @@ -65,7 +65,7 @@ "@walmart/pay-stub-miniapp": "0.9.5", "@walmart/payrollsolution_miniapp": "0.130.1", "@walmart/price-changes-mini-app": "1.5.6", - "@walmart/profile-feature-app": "0.70.0", + "@walmart/profile-feature-app": "0.73.0", "@walmart/push-to-talk-mini-app": "1.8.15", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", @@ -5543,9 +5543,9 @@ } }, "node_modules/@walmart/profile-feature-app": { - "version": "0.70.0", - "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.70.0.tgz", - "integrity": "sha512-ew60IdbrRXPCdhQzXYjRRTKoSk3phW2S/lqKay1K70HKtINTDwVZ2Wi5tYZrAqXE6AIJHLQPetRhW7fXlzFzWQ==", + "version": "0.73.0", + "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.73.0.tgz", + "integrity": "sha512-R/q1MQQ0epCxX4kZXYy0T4cIAY710f2nhqgfD0/24C5Nag3KRrVForujc7IvRBfa5H+a1AxT5Y+3B0sP1eJg3g==", "peerDependencies": { "@react-navigation/bottom-tabs": "^6.0.0", "@react-navigation/material-top-tabs": "^6.0.0", @@ -24992,9 +24992,9 @@ "version": "1.5.6" }, "@walmart/profile-feature-app": { - "version": "0.70.0", - "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.70.0.tgz", - "integrity": "sha512-ew60IdbrRXPCdhQzXYjRRTKoSk3phW2S/lqKay1K70HKtINTDwVZ2Wi5tYZrAqXE6AIJHLQPetRhW7fXlzFzWQ==" + "version": "0.73.0", + "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.73.0.tgz", + "integrity": "sha512-R/q1MQQ0epCxX4kZXYy0T4cIAY710f2nhqgfD0/24C5Nag3KRrVForujc7IvRBfa5H+a1AxT5Y+3B0sP1eJg3g==" }, "@walmart/push-to-talk-mini-app": { "version": "1.8.15" --- package.json @@ -107,7 +107,7 @@ "@walmart/pay-stub-miniapp": "0.9.5", "@walmart/payrollsolution_miniapp": "0.130.1", "@walmart/price-changes-mini-app": "1.5.6", - "@walmart/profile-feature-app": "0.70.0", + "@walmart/profile-feature-app": "0.73.0", "@walmart/push-to-talk-mini-app": "1.8.15", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0",
bump profile to add better ids and turn on fwb money carousel
bump profile to add better ids and turn on fwb money carousel
3fafd9bbf3d3393cd52a85424ae9b37ad27fc192
--- index.js @@ -8,9 +8,9 @@ import 'moment/locale/es'; import 'moment/locale/es-mx'; import {AppRegistry} from 'react-native'; -import {CodePushApp} from './src'; +import {App} from './src'; import {name as appName} from './app.json'; -AppRegistry.registerComponent(appName, () => CodePushApp); +AppRegistry.registerComponent(appName, () => App); registerAskSamWidgets(); // registerHomeWidgets(); --- ios/AllSpark.xcodeproj/project.pbxproj @@ -560,7 +560,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = D994751F557438D6B85DBCC2 /* Pods-AllSpark.debug.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Beta"; + ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Dev"; CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = AllSpark/AllSpark.entitlements; @@ -607,7 +607,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 99D7C873A014A98046591001 /* Pods-AllSpark.release.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Beta"; + ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Dev"; CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = AllSpark/AllSpark.entitlements; --- ios/AllSpark/Info.plist @@ -118,7 +118,7 @@ <string>remote-notification</string> </array> <key>UILaunchStoryboardName</key> - <string>LaunchScreen-Beta</string> + <string>LaunchScreen-Dev</string> <key>UIRequiredDeviceCapabilities</key> <array> <string>armv7</string> --- scripts/updateAndroidProjectConfig.sh @@ -13,18 +13,24 @@ APP_MANIFEST="android/app/src/main/AndroidManifest.xml" MAIN_APPLICATION="android/app/src/main/java/com/walmart/stores/allspark/beta/MainApplication.java" MAIN_ACTIVITY="android/app/src/main/java/com/walmart/stores/allspark/beta/MainActivity.java" MAIN_APPLICATION_RN_HOST="android/app/src/main/java/com/walmart/stores/allspark/beta/newarchitecture/MainApplicationReactNativeHost.java" +STRINGS_XML="android/app/src/main/res/values/strings.xml" BETA_PACKAGE="com.walmart.stores.allspark.beta" PROD_PACKAGE="com.walmart.squiggly" BETA_BUILD_CONFIG="${BETA_PACKAGE}.BuildConfig" PROD_BUILD_CONFIG="${PROD_PACKAGE}.BuildConfig" +BETA_DEV_CODE_PUSH_KEY='bxaFhKysMbgqkicxhpd_CLuY1ae6DxsB5N7uU' +PROD_CODE_PUSH_KEY='YMsO6CEWm-fDK6bXv7MaEiS84eshsHxXf3p5_' + if [[ "${env}" == "Prod" ]]; then PACKAGE=${PROD_PACKAGE} SPLASH=${PROD_SPLASH} + CODE_PUSH_KEY=$PROD_CODE_PUSH_KEY else PACKAGE=${BETA_PACKAGE} SPLASH=${BETA_SPLASH} + CODE_PUSH_KEY=$BETA_DEV_CODE_PUSH_KEY fi ## Find and replace package name ######## @@ -47,5 +53,7 @@ sed -Ei '' "s/import ${BETA_BUILD_CONFIG};|import ${PROD_BUILD_CONFIG};/import $ echo "Updating BuildConfig import to ${BUILD_CONFIG} in ${MAIN_ACTIVITY}" sed -Ei '' "s/import ${BETA_BUILD_CONFIG};|import ${PROD_BUILD_CONFIG};/import ${BUILD_CONFIG};/" ${MAIN_ACTIVITY} +echo "Updating CodePushDeploymentKey to ${CODE_PUSH_KEY} in ${STRINGS_XML}" +sed -Ei '' "s/${BETA_DEV_CODE_PUSH_KEY}|${PROD_CODE_PUSH_KEY}/${CODE_PUSH_KEY}/" ${STRINGS_XML} --- scripts/updateiOSProjectConfig.sh @@ -42,6 +42,9 @@ PROD_ENTITLEMENTS="AllSpark-Prod.entitlements" BETA_ENTITLEMENTS="AllSpark-Beta.entitlements" DEFAULT_ENTITLEMENTS="AllSpark.entitlements" +BETA_DEV_CODE_PUSH_KEY='LCVCkTeZVt9h-JYHlQ4NFkOQfYJkTL3RKk4nt' +PROD_CODE_PUSH_KEY='SuNHsCYgxx_cg6btqJerNKFWesISNjZzHHCRG' + # Generate AppIcon name based on the environment APP_ICON="AppIcon-$env" SPLASH_SCREEN="<string>LaunchScreen-$env<\/string>" @@ -54,6 +57,7 @@ if [[ "${env}" == "Prod" ]]; then INHOUSE_PROVISION=$PROD_INHOUSE_PROVISIONING DEV_PROVISION=$PROD_DEV_PROVISIONING SUMO_GROUP_ID=$PROD_SUMO_GROUP_ID + CODE_PUSH_KEY=$PROD_CODE_PUSH_KEY else TEAM_ID=$ENTERPRISE_TEAM_ID BUNDLE_ID=$BETA_BUNDLE_ID @@ -61,6 +65,7 @@ else INHOUSE_PROVISION=$BETA_INHOUSE_PROVISIONING DEV_PROVISION=$BETA_DEV_PROVISIONING SUMO_GROUP_ID=$BETA_SUMO_GROUP_ID + CODE_PUSH_KEY=$BETA_DEV_CODE_PUSH_KEY fi ## Find and replace the Team Id @@ -79,6 +84,9 @@ sed -Ei '' "s/$BETA_BUNDLE_ID|$PROD_BUNDLE_ID/$BUNDLE_ID/" ${plist} echo "Updating SumoAppGroupId Id \"$BETA_SUMO_GROUP_ID\" with \"$SUMO_GROUP_ID\" " sed -Ei '' "s/$BETA_SUMO_GROUP_ID|$PROD_SUMO_GROUP_ID/$SUMO_GROUP_ID/" ${plist} +## Find and replace the CodePush deployment key +echo "Updating CodePushDeploymentKey \"$BETA_DEV_CODE_PUSH_KEY\" with \"$CODE_PUSH_KEY\" " +sed -Ei '' "s/$BETA_DEV_CODE_PUSH_KEY|$PROD_CODE_PUSH_KEY/$CODE_PUSH_KEY/" ${plist} ########### Finished updating Info.plist file ############# --- src/index.tsx @@ -50,7 +50,7 @@ const AllsparkNav = () => { ); }; -export const App = () => ( +export const BaseApp = () => ( <SafeAreaProvider> <LivingDesignProvider> <AllsparkCoreServices recipe={AllsparkRecipe}> @@ -68,9 +68,10 @@ export const App = () => ( </SafeAreaProvider> ); +// Customize this options based on final discussion. let codePushOptions = { checkFrequency: codePush.CheckFrequency.ON_APP_START, - updateDialog: {title: 'Update is available'}, - installMode: codePush.InstallMode.IMMEDIATE, + updateDialog: {title: 'Update is available'}, //Remove this + installMode: codePush.InstallMode.IMMEDIATE, // Change this to ON_NEXT_RESTART }; -export const CodePushApp = codePush(codePushOptions)(App); +export const App = codePush(codePushOptions)(BaseApp);
added prod and dev keys
added prod and dev keys
b75840fce691db3b3aa0e2053031451726735283
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/wmconnect-mini-app", - "version": "3.5.0", + "version": "3.2.0-alpha.7", "main": "dist/index.js", "files": [ "dist",
feat(ui): update version
feat(ui): update version
9525f2064ccb9e779a0b1e559332240d6c3c3043
--- package-lock.json @@ -65,7 +65,7 @@ "@walmart/ims-print-services-ui": "2.9.1", "@walmart/inbox-mini-app": "0.91.6", "@walmart/iteminfo-mini-app": "7.9.0", - "@walmart/learning-mini-app": "18.0.5", + "@walmart/learning-mini-app": "20.0.11", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/metrics-mini-app": "0.19.4", "@walmart/mod-flex-mini-app": "1.15.5", @@ -9181,9 +9181,9 @@ } }, "node_modules/@walmart/learning-mini-app": { - "version": "18.0.5", - "resolved": "https://npme.walmart.com/@walmart/learning-mini-app/-/learning-mini-app-18.0.5.tgz", - "integrity": "sha512-CXVWO2BI9lHTHXnws1vaLRv7UIrrxkZRkI0lKgu2BM6P93tbCRnQSq+liQHGOT0Gb1wmjhtuuIPUvXlJSGz4Ow==", + "version": "20.0.11", + "resolved": "https://npme.walmart.com/@walmart/learning-mini-app/-/learning-mini-app-20.0.11.tgz", + "integrity": "sha512-p8oHnDKCZMaUf4b28b28soiCCM6jPqtZJjz7VcmWR6n740WcJT0Fj2Tkav47sc99GwDGJtlwW2fR0PTtkJoKmA==", "hasInstallScript": true, "peerDependencies": { "@atmt/feedback-component-native": "^8.0.0", @@ -9216,8 +9216,7 @@ "@walmart/ui-components": "1.15.6", "@walmart/wfm-ui": "0.2.25", "base-64": "^1.0.0", - "expo": "49.0.10", - "expo-av": "13.4.1", + "expo": "49.0.13", "expo-image": "~1.3.5", "expo-sharing": "~11.7.0", "graphql": "^16.1.0", @@ -33325,9 +33324,9 @@ "integrity": "sha512-vw7xC45WA62Odc3pvfwaoJYnDVW1eytiAoDNMEF6+8VwQ9ZPzpmmp0jOmfT1iglbQMe+Z/eZ9ZJ1FU86myczsw==" }, "@walmart/learning-mini-app": { - "version": "18.0.5", - "resolved": "https://npme.walmart.com/@walmart/learning-mini-app/-/learning-mini-app-18.0.5.tgz", - "integrity": "sha512-CXVWO2BI9lHTHXnws1vaLRv7UIrrxkZRkI0lKgu2BM6P93tbCRnQSq+liQHGOT0Gb1wmjhtuuIPUvXlJSGz4Ow==" + "version": "20.0.11", + "resolved": "https://npme.walmart.com/@walmart/learning-mini-app/-/learning-mini-app-20.0.11.tgz", + "integrity": "sha512-p8oHnDKCZMaUf4b28b28soiCCM6jPqtZJjz7VcmWR6n740WcJT0Fj2Tkav47sc99GwDGJtlwW2fR0PTtkJoKmA==" }, "@walmart/manager-approvals-miniapp": { "version": "0.2.4", --- package.json @@ -106,7 +106,7 @@ "@walmart/ims-print-services-ui": "2.9.1", "@walmart/inbox-mini-app": "0.91.6", "@walmart/iteminfo-mini-app": "7.9.0", - "@walmart/learning-mini-app": "18.0.5", + "@walmart/learning-mini-app": "20.0.11", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/metrics-mini-app": "0.19.4", "@walmart/mod-flex-mini-app": "1.15.5",
feat: :sparkles: Bump learning mini app version to 20.0.11
feat: :sparkles: Bump learning mini app version to 20.0.11
a6dabccddaed5313e64fdc3e5da5cf6afe9bcf2b
--- android/app/build.gradle @@ -134,8 +134,8 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 147 - versionName "1.1.0" + versionCode 221 + versionName "1.3.0" } splits { abi { --- ios/AllSpark/Info.plist @@ -17,7 +17,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.1.0</string> + <string>1.3.0</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>147</string> + <string>221</string> <key>FirebaseAutomaticScreenReportingEnabled</key> <false /> <key>LSApplicationQueriesSchemes</key> --- package-lock.json @@ -1,6 +1,6 @@ { "name": "allspark-main", - "version": "1.1.0", + "version": "1.3.0", "lockfileVersion": 1, "requires": true, "dependencies": { --- package.json @@ -1,6 +1,6 @@ { "name": "allspark-main", - "version": "1.1.0", + "version": "1.3.0", "private": true, "scripts": { "firebase:dev": "cp ./ios/GoogleService-Info-Dev.plist ./ios/GoogleService-Info.plist && cp ./android/app/google-services-dev.json ./android/app/google-services.json",
version bump for drop 3
version bump for drop 3
3b8e2c5bc5a577a028308e38457312f6e3b75e82
--- src/channels/types.ts @@ -19,6 +19,7 @@ export type ChannelDocumentSnapshot = export type LocalFirebaseChannel = FirebaseChannel & { id: string; recipients: string[]; + time?: string[]; }; export type LastMessage = FirebaseMessage & { --- src/containers/Message/index.tsx @@ -47,6 +47,7 @@ export const Message = ({ image, audio, readReceipt, + messageTime, }: LocalMessage) => { const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); return ( @@ -86,6 +87,9 @@ export const Message = ({ : t('messageScreen.deliveredReadReceipt')} </Caption> )} + {!!messageTime && ( + <Caption UNSAFE_style={styles.readReceipt}>{messageTime}</Caption> + )} </View> </View> ); --- src/types.ts @@ -51,6 +51,7 @@ export type LocalMessage = FirebaseMessage & { isMyMessage: boolean; messagePath: string; readReceipt?: string; + messageTime?: string; }; export type SubscriptionContext<T> = T & { --- src/utils/messages.ts @@ -1,6 +1,6 @@ /* eslint-disable curly */ import {FirebaseFirestoreTypes} from '@react-native-firebase/firestore'; -import moment from 'moment-timezone'; +import moment, {Moment} from 'moment-timezone'; import {FirebaseMessage, LocalMessage} from '../types'; import {LocalFirebaseChannel} from '../channels/types'; @@ -48,9 +48,10 @@ export const createLocalMesssage = (config: { document: FirebaseFirestoreTypes.QueryDocumentSnapshot<FirebaseMessage>; viewerId: string; channel: LocalFirebaseChannel; + messageTime?: string; hasPendingWrites: boolean; }) => { - const {document, viewerId, ...restConfig} = config; + const {document, viewerId, messageTime, ...restConfig} = config; const message = document.data() as FirebaseMessage; const isMyMessage = message.sentFrom === viewerId; @@ -62,6 +63,7 @@ export const createLocalMesssage = (config: { ? createReadReceipt({message, viewerId, ...restConfig}) : undefined, messagePath: document.ref.path, + messageTime, ...message, }; }; @@ -84,8 +86,13 @@ export const createMessageList = (config: { ? moment(startAtDate.toDate()) : null; + const getLastMessageTime = (messageMoment: Moment) => + messageMoment.isSame(todayMoment, 'day') + ? messageMoment.format('h:mm A') + : messageMoment.format('ddd, MMM D [at] h:mm A'); + // This is assuming that it is traversing descending order by timestamp - docs.forEach((document) => { + docs.forEach((document, index) => { const data = document.data(); const hasPendingWrites = document.metadata.hasPendingWrites; const createdAt = moment(data.createdAt?.toDate()); @@ -98,11 +105,22 @@ export const createMessageList = (config: { messages.push(date); } - - // Push message regardless - messages.push( - createLocalMesssage({document, hasPendingWrites, ...restConfig}), - ); + if (index === 0) { + const messageTime = getLastMessageTime(createdAt); + messages.push( + createLocalMesssage({ + document, + hasPendingWrites, + messageTime, + ...restConfig, + }), + ); + } else { + // Push message regardless + messages.push( + createLocalMesssage({document, hasPendingWrites, ...restConfig}), + ); + } // Update last message moment lastMoment = createdAt; --- src/channels/types.ts @@ -19,6 +19,7 @@ export type ChannelDocumentSnapshot = export type LocalFirebaseChannel = FirebaseChannel & { id: string; recipients: string[]; + time?: string[]; }; export type LastMessage = FirebaseMessage & { --- src/containers/Message/index.tsx @@ -47,6 +47,7 @@ export const Message = ({ image, audio, readReceipt, + messageTime, }: LocalMessage) => { const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); return ( @@ -86,6 +87,9 @@ export const Message = ({ : t('messageScreen.deliveredReadReceipt')} </Caption> )} + {!!messageTime && ( + <Caption UNSAFE_style={styles.readReceipt}>{messageTime}</Caption> + )} </View> </View> ); --- src/types.ts @@ -51,6 +51,7 @@ export type LocalMessage = FirebaseMessage & { isMyMessage: boolean; messagePath: string; readReceipt?: string; + messageTime?: string; }; export type SubscriptionContext<T> = T & { --- src/utils/messages.ts @@ -1,6 +1,6 @@ /* eslint-disable curly */ import {FirebaseFirestoreTypes} from '@react-native-firebase/firestore'; -import moment from 'moment-timezone'; +import moment, {Moment} from 'moment-timezone'; import {FirebaseMessage, LocalMessage} from '../types'; import {LocalFirebaseChannel} from '../channels/types'; @@ -48,9 +48,10 @@ export const createLocalMesssage = (config: { document: FirebaseFirestoreTypes.QueryDocumentSnapshot<FirebaseMessage>; viewerId: string; channel: LocalFirebaseChannel; + messageTime?: string; hasPendingWrites: boolean; }) => { - const {document, viewerId, ...restConfig} = config; + const {document, viewerId, messageTime, ...restConfig} = config; const message = document.data() as FirebaseMessage; const isMyMessage = message.sentFrom === viewerId; @@ -62,6 +63,7 @@ export const createLocalMesssage = (config: { ? createReadReceipt({message, viewerId, ...restConfig}) : undefined, messagePath: document.ref.path, + messageTime, ...message, }; }; @@ -84,8 +86,13 @@ export const createMessageList = (config: { ? moment(startAtDate.toDate()) : null; + const getLastMessageTime = (messageMoment: Moment) => + messageMoment.isSame(todayMoment, 'day') + ? messageMoment.format('h:mm A') + : messageMoment.format('ddd, MMM D [at] h:mm A'); + // This is assuming that it is traversing descending order by timestamp - docs.forEach((document) => { + docs.forEach((document, index) => { const data = document.data(); const hasPendingWrites = document.metadata.hasPendingWrites; const createdAt = moment(data.createdAt?.toDate()); @@ -98,11 +105,22 @@ export const createMessageList = (config: { messages.push(date); } - - // Push message regardless - messages.push( - createLocalMesssage({document, hasPendingWrites, ...restConfig}), - ); + if (index === 0) { + const messageTime = getLastMessageTime(createdAt); + messages.push( + createLocalMesssage({ + document, + hasPendingWrites, + messageTime, + ...restConfig, + }), + ); + } else { + // Push message regardless + messages.push( + createLocalMesssage({document, hasPendingWrites, ...restConfig}), + ); + } // Update last message moment lastMoment = createdAt;
adding a last message time
adding a last message time
8b303338009b23c7e64d9f3d2065579c2c7baedf
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Hub/SiteHubDashboard.tsx @@ -30,6 +30,7 @@ import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation import { createDefaultWidgetPlaceholder } from '../../../HubFeature/utils'; import { OnboardingScreen } from '../Screens/OnboardingScreen/OnboardingScreen'; import { Popover } from '../../Shared/Components/Popover'; +import { useGetSupplyChainTeamsPreferenceQuery } from '../../Hooks/upsertSupplyChainAssociatePreferenceMutation'; import { AllsparkNavigationClient, AllsparkLocalStorage, @@ -41,7 +42,8 @@ import { teamSwitcherEnabled } from '../Redux'; export const SiteHubDashboard = ({ name, widgets }: HubDashboardProps) => { const { showOnboarding, hideOnboardingFlow } = useOnboardingContext(); const { allSiteTeams } = useGetSupplyChainAllTeamsBySite(); - + const { shiftPreferenceData, teamPreferenceData } = + useGetSupplyChainTeamsPreferenceQuery(); const [teamState, setTeamState] = useState<{ teamLabel: string; teamIds: string[]; @@ -65,6 +67,7 @@ export const SiteHubDashboard = ({ name, widgets }: HubDashboardProps) => { ManagerExperienceSelectors.getDefaultWidgets ); /**Refresh props */ + const [shiftDataNew, setShiftDataNew] = useState([]); const [state, setState] = useState<{ refreshTime: string | null; refreshing: boolean; @@ -81,10 +84,20 @@ export const SiteHubDashboard = ({ name, widgets }: HubDashboardProps) => { const scrollPosition = useRef(new Animated.Value(0)).current; const showHubTeamSwitcher = useSelector(teamSwitcherEnabled); // TODO: Create separate selector for supply chain team switcher - console.log('showHubTeamSwitcher,', showHubTeamSwitcher); + // console.log('showHubTeamSwitcher,', showHubTeamSwitcher); const hubScreeName = useSelector(ManagerExperienceSelectors.getHubScreenName); const { t } = useAllsparkTranslation(FEATURE_ID); + useEffect(() => { + if (shiftPreferenceData.length && !selectedShifts.length) { + setShiftDataNew(shiftPreferenceData); + } else if (selectedShifts.length) { + setShiftDataNew(selectedShifts); + } else { + setShiftDataNew(['A1']); + } + // setShiftDataNew(selectedShifts.length > 0 ? selectedShifts : (shiftPreferenceData.length > 0 ? shiftPreferenceData : ["A1"])); + }, [shiftPreferenceData, selectedShifts]); const checkPopoverStatus = useCallback(async () => { const isFirstTime = await AllsparkLocalStorage.get(POPOVER_KEY); if (!isFirstTime) { @@ -106,6 +119,11 @@ export const SiteHubDashboard = ({ name, widgets }: HubDashboardProps) => { return matchingTeamNames; }; + const teamsToBeShown = selectedTeamIds.length + ? selectedTeamIds + : teamPreferenceData.length + ? teamPreferenceData + : [constant_1.TOTAL_STORE_TEAM_ID]; const allTeamData = getTeamNameById(selectedTeamIds); // After changing store, reload all the hub widgets with new store data. useEffect(() => { @@ -229,7 +247,7 @@ export const SiteHubDashboard = ({ name, widgets }: HubDashboardProps) => { numTotalShifts={6} teamName={allTeamData[0]} teamId={selectedTeamIds?.[0] || '1000000'} - selectedShifts={selectedShifts} + selectedShifts={shiftDataNew} onPress={() => { AllsparkNavigationClient.openModal( 'managerExperience.supplyChain.updateModal' as any
Adding SiteHubdashboard changes
Adding SiteHubdashboard changes
0f3ad1dfbca3b033746387229c03b9aeb2605d97
--- package-lock.json @@ -4475,9 +4475,9 @@ } }, "@walmart/taskit-mini-app": { - "version": "0.228.0-rc.0", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.228.0-rc.0.tgz", - "integrity": "sha512-8SdqWRLpPznrF7mXgornPrOYEtdJsTU+85OEgCw+gn3odZTDMQxUJ7UOjJb7xiNX3OkVMWadPL1wqYaZMgEmHg==" + "version": "0.234.0-rc.0", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.234.0-rc.0.tgz", + "integrity": "sha512-G/GZNvkZwnSHJPNqjeUGzQIJVTQzbxVQJ5jL71KkTmqny2cFixkDXBgPXoIpKxmow2P0tVokNkhV2lore5Tlug==" }, "@walmart/time-clock-mini-app": { "version": "0.4.30", --- package.json @@ -101,7 +101,7 @@ "@walmart/schedule-mini-app": "0.12.0", "@walmart/settings-mini-app": "1.6.0", "@walmart/shelfavailability-mini-app": "0.8.3", - "@walmart/taskit-mini-app": "0.228.0-rc.0", + "@walmart/taskit-mini-app": "0.234.0-rc.0", "@walmart/time-clock-mini-app": "0.4.30", "@walmart/ui-components": "1.3.0-rc.14", "@walmart/welcomeme-mini-app": "0.45.0",
Updating taskit version
Updating taskit version
20310441e6e0b72c5294c490df29122313158507
--- targets/US/ios/AllSpark/AllSpark.entitlements @@ -4,6 +4,8 @@ <dict> <key>aps-environment</key> <string>development</string> + <key>com.apple.developer.networking.wifi-info</key> + <true/> <key>com.apple.security.application-groups</key> <array> <string>group.com.walmart</string>
Add wifi info to entitlement file
Add wifi info to entitlement file
c0db6c72af144822123793e9a6558155cb3749aa
--- graphql.yml @@ -12,66 +12,54 @@ applications: - name: "dev" persistedQueries: - name: "GetAssociateName" - hash: "1ed1fb4a4f980b13e0786d68cf59747ecd6e58fc870f784c80f3de156fe35777" queryTemplate: "src/queries/getAssociateName.graphql" tags: - "v1" - name: "GetDailyRoster" - hash: "3ad96d069a6b510162bd3e1e0a759da94e1b8006986130f651ab5f460d5615aa" queryTemplate: "src/queries/getDailyRoster.graphql" tags: - "v1" - name: "GetTeamById" - hash: "0f613b84ad474a228e42952208ea7d87ba2039fac53d8a2e090c73f699b7373b" queryTemplate: "src/queries/getTeamById.graphql" tags: - "v1" - name: "upsertAssociateTextPreferences" - hash: "c32767303508d355e17b8489f8ecd28ec16a22ea3c454f9347ae96c9aefbec3b" queryTemplate: "src/queries/upsertAssociateTextPreference.graphql" tags: - "v1" - name: "stage" persistedQueries: - name: "GetAssociateName" - hash: "1ed1fb4a4f980b13e0786d68cf59747ecd6e58fc870f784c80f3de156fe35777" queryTemplate: "src/queries/getAssociateName.graphql" tags: - "v1" - name: "GetDailyRoster" - hash: "3ad96d069a6b510162bd3e1e0a759da94e1b8006986130f651ab5f460d5615aa" queryTemplate: "src/queries/getDailyRoster.graphql" tags: - "v1" - name: "GetTeamById" - hash: "0f613b84ad474a228e42952208ea7d87ba2039fac53d8a2e090c73f699b7373b" queryTemplate: "src/queries/getTeamById.graphql" tags: - "v1" - name: "upsertAssociateTextPreferences" - hash: "c32767303508d355e17b8489f8ecd28ec16a22ea3c454f9347ae96c9aefbec3b" queryTemplate: "src/queries/upsertAssociateTextPreference.graphql" tags: - "v1" - name: "prod" persistedQueries: - name: "GetAssociateName" - hash: "1ed1fb4a4f980b13e0786d68cf59747ecd6e58fc870f784c80f3de156fe35777" queryTemplate: "src/queries/getAssociateName.graphql" tags: - "v1" - name: "GetDailyRoster" - hash: "3ad96d069a6b510162bd3e1e0a759da94e1b8006986130f651ab5f460d5615aa" queryTemplate: "src/queries/getDailyRoster.graphql" tags: - "v1" - name: "GetTeamById" - hash: "0f613b84ad474a228e42952208ea7d87ba2039fac53d8a2e090c73f699b7373b" queryTemplate: "src/queries/getTeamById.graphql" tags: - "v1" - name: "upsertAssociateTextPreferences" - hash: "c32767303508d355e17b8489f8ecd28ec16a22ea3c454f9347ae96c9aefbec3b" queryTemplate: "src/queries/upsertAssociateTextPreference.graphql" tags: - "v1"
feat(ui): removed hash values
feat(ui): removed hash values
eae5f92d84e33a358fe70623e5eacc46428eba3f
--- package.json @@ -90,7 +90,7 @@ "@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.10.0", + "@walmart/roster-mini-app": "3.11.0", "@walmart/ui-components": "1.15.1", "@walmart/wmconnect-mini-app": "3.8.0", "babel-jest": "^29.6.3", --- yarn.lock @@ -7606,7 +7606,7 @@ __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.10.0" + "@walmart/roster-mini-app": "npm:3.11.0" "@walmart/ui-components": "npm:1.15.1" "@walmart/wmconnect-mini-app": "npm:3.8.0" babel-jest: "npm:^29.6.3" @@ -7714,9 +7714,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:3.10.0": - version: 3.10.0 - resolution: "@walmart/roster-mini-app@npm:3.10.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.10.0.tgz" +"@walmart/roster-mini-app@npm:3.11.0": + version: 3.11.0 + resolution: "@walmart/roster-mini-app@npm:3.11.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.11.0.tgz" peerDependencies: "@walmart/allspark-foundation": ">=7.12.0" "@walmart/gtp-shared-components-3": "*" @@ -7728,7 +7728,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/ce5bd58c4a7f38be491a5e6367783a19a33dac23e8dc3e8df6d52a7379d42761e70393fc5c126fbbc63addaa84f0dbb4f9ecf946fd8bdbcfff2e487da77b8415 + checksum: 10c0/2d18a78e1f2759143553b47ff99b53895d541c144b6685885c9b169116c4562a94332671dda6b7fd60d3f1da95372b3aa530e151683ddf5e85699e2a06f2f890 languageName: node linkType: hard
feat(ui): update roster version
feat(ui): update roster version
6570e4036fa88f78f11d11aab559ac251df936ca
--- packages/core-services-allspark/src/user/types.ts @@ -1 +1 @@ -export type { BU_TYPE_DOMAIN } from '@walmart/me-at-walmart-common'; +export { BU_TYPE_DOMAIN } from '@walmart/me-at-walmart-container'; --- packages/me-at-walmart-container/src/services/user/transforms.ts @@ -4,15 +4,13 @@ import { User, } from '@walmart/allspark-foundation/User'; import { - BU_TYPE_DOMAIN, - DOMAIN, GetAssociateByIdQuery, GetLoggedInUserQuery, UserDomain, UserType, } from '@walmart/me-at-walmart-common'; -import { TokenData } from './types'; +import { BU_TYPE_DOMAIN, TokenData } from './types'; import { generateImpersonationToken, inferDomain, @@ -81,7 +79,7 @@ export const tokenDataToUser = (tokenData: TokenData) => { countryCode: c || DEFAULT_COUNTRY_CODE, domain: inferDomainFromUpn(upn), userType: UserType.associate, - employeeType: domain === DOMAIN.homeoffice ? 'S' : 'H', + employeeType: domain === UserDomain.homeoffice ? 'S' : 'H', //?? // employeeType: 'H', // fullTimePartTime: 'PT', @@ -138,6 +136,14 @@ export const parseUserResponse = ( geographicCategoryCode: associate?.geographicCategoryCode, hireDate: associate?.hireDate || user.wmHireDate, mdseDivNumber: associate?.mdseDivNumber?.toString(), + preferences: { + birthday: + associate?.associatePreferences?.meAtWalmartPreferences + ?.displayPreferences?.birthday, + anniversary: + associate?.associatePreferences?.meAtWalmartPreferences + ?.displayPreferences?.anniversary, + }, // associate fields - not modified/defaulted employmentStatus: associate?.employmentStatus, jobCategoryCode: associate?.jobCategoryCode, --- packages/me-at-walmart-container/src/services/user/types.ts @@ -1,4 +1,13 @@ import { User } from '@walmart/allspark-foundation/User'; +import { UserDomain } from '@walmart/me-at-walmart-common'; + +// Mapping of Business Unit code to domain name on UI +export enum BU_TYPE_DOMAIN { + SC = UserDomain.store, + ST = UserDomain.store, + DC = UserDomain.dc, + HO = UserDomain.homeoffice, +} export enum UserInfoSource { ATHENA = 'ATHENA', --- packages/me-at-walmart-container/src/services/user/utils.ts @@ -1,7 +1,8 @@ import moment from 'moment-timezone'; import CryptoJS from 'crypto-js'; -import { BU_TYPE_DOMAIN, DOMAIN } from '@walmart/me-at-walmart-common'; +import { UserDomain } from '@walmart/me-at-walmart-common'; import { MeAtWalmartLoggerService } from '../logger'; +import { BU_TYPE_DOMAIN } from './types'; export const UserLogger = MeAtWalmartLoggerService.createFeatureInstance('user'); @@ -17,9 +18,9 @@ export const stringMatchCreator = (regExp: RegExp) => (email: string) => regExp.test(email); export const emailDomainMatches: Record<string, (email: string) => boolean> = { - [DOMAIN.homeoffice]: stringMatchCreator(/homeoffice/), - [DOMAIN.storeClub]: stringMatchCreator(/\.s0/), - [DOMAIN.dc]: stringMatchCreator(/@wmsc/), + [UserDomain.homeoffice]: stringMatchCreator(/homeoffice/), + [UserDomain.store]: stringMatchCreator(/\.s0/), + [UserDomain.dc]: stringMatchCreator(/@wmsc/), }; // Infer domain from business unit, upn, or both @@ -31,7 +32,7 @@ export const inferDomainFromBusinessUnit = ( // @ts-ignore return BU_TYPE_DOMAIN[ businessUnitType as keyof typeof BU_TYPE_DOMAIN - ] as DOMAIN; + ] as UserDomain; }; export const inferDomainFromUpn = (upn: string) => { @@ -39,7 +40,7 @@ export const inferDomainFromUpn = (upn: string) => { emailDomainMatches[domainToCheck](upn) ); - return domain as DOMAIN | undefined; + return domain as UserDomain | undefined; }; export const inferDomain = (
fix: update domain mapping to use lower cased user domain
fix: update domain mapping to use lower cased user domain
d4c79f0708912bd5f717c4964d5b28e3ae5f8621
--- src/navigation/types.ts @@ -9,7 +9,6 @@ export type TextingNavParamsMap = { >['path']; details?: NewChannelDetails; }; - 'myTeam.meganavScreen': undefined; 'myTeam.newMessage': undefined; 'myTeam.viewTeam': {teamId: string}; 'myTeam.searchScreen': {searchInput: string}; --- src/navigation/types.ts @@ -9,7 +9,6 @@ export type TextingNavParamsMap = { >['path']; details?: NewChannelDetails; }; - 'myTeam.meganavScreen': undefined; 'myTeam.newMessage': undefined; 'myTeam.viewTeam': {teamId: string}; 'myTeam.searchScreen': {searchInput: string};
remove unused type
remove unused type
2e57b103aec4391cc6feaa5e7dd6709aa187afac
--- src/utils/timestamps.ts @@ -18,7 +18,7 @@ export const channelRowTimeStamp = ( } else if ( messageTimeStamp.isSame(currentDate.clone().subtract(1, 'days'), 'day') ) { - return 'Yesterday'; + return messageTimeStamp.format('[Yesterday]'); } else { return messageTimeStamp.format('dddd'); } --- src/utils/timestamps.ts @@ -18,7 +18,7 @@ export const channelRowTimeStamp = ( } else if ( messageTimeStamp.isSame(currentDate.clone().subtract(1, 'days'), 'day') ) { - return 'Yesterday'; + return messageTimeStamp.format('[Yesterday]'); } else { return messageTimeStamp.format('dddd'); }
Added Yesterday string changes
Added Yesterday string changes
759f5b3a11c0c0b10e71ce1d8f10dfee1d2bfeaa
--- packages/allspark-container/src/httpClient/interceptors.ts @@ -1,8 +1,8 @@ import Axios, { AxiosRequestConfig } from 'axios'; import { AuthData } from '@walmart/allspark-foundation/Auth'; import { User } from '@walmart/allspark-foundation/User'; +import { getCorrelationId } from '@walmart/allspark-foundation/Utils'; import { IAllsparkLogger } from '../types'; -import { getCorrelationId } from '../utils'; import { HttpClientQueue } from './queue'; export async function addCorrelationInterceptor( --- packages/allspark-container/src/logger/sagas.ts @@ -10,21 +10,22 @@ import { DeviceInfo, DeviceInfoTypes, } from '@walmart/allspark-foundation/DeviceInfo'; -import { IAllsparkLogger } from './index'; -import { createRestartableSagas } from '@walmart/allspark-foundation/Redux'; import { NetworkStateChanged, NetworkTypes, } from '@walmart/allspark-foundation/Network'; -import { getNetworkAttributes } from '../network/utils'; -import { IAllsparkNetworkState } from '../network'; import { NotificationGlobalSelectors, NotificationTypes, } from '@walmart/allspark-foundation/Notification'; -import { encryptUserId } from '../utils'; +import { encryptUserId } from '@walmart/allspark-foundation/Utils'; +import { createRestartableSagas } from '@walmart/allspark-foundation/Redux'; + +import { getNetworkAttributes } from '../network/utils'; +import { IAllsparkNetworkState } from '../network'; import { getEncryptionKey, getUserEncryptionKey } from '../user/utils'; import { USER_CHANGED_ACTIONS } from '../user/constants'; +import { IAllsparkLogger } from './index'; type LoggerSagaScope = { logger: IAllsparkLogger; --- packages/allspark-container/src/telemetry/sagas.ts @@ -14,12 +14,12 @@ import { NetworkStateChanged, NetworkTypes, } from '@walmart/allspark-foundation/Network'; +import { encryptUserId } from '@walmart/allspark-foundation/Utils'; import { TUserInfo } from '@walmart/react-native-logger/dist/types'; import { IAllsparkNetworkState } from '../network'; import { getNetworkAttributes } from '../network/utils'; import { IAllsparkTelemetry } from './index'; import { USER_CHANGED_ACTIONS } from '../user/constants'; -import { encryptUserId } from '../utils'; import { getEncryptionKey } from '../user/utils'; type TelemetrySagaScope = { --- packages/allspark-container/src/types/index.ts @@ -17,8 +17,6 @@ import { UserInstance } from '@walmart/allspark-foundation/User'; import { LocalStorageInstance } from '@walmart/allspark-foundation/LocalStorage'; import { ScannerInstance } from '@walmart/allspark-foundation/Scanner'; -export type PartialBy<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>; - export type OpenIdConfig = { issuer: string; clientId: string; --- packages/allspark-foundation/Utils/encryptUserId.ts @@ -0,0 +1,11 @@ +import CryptoJS from 'crypto-js'; + +export const encryptUserId = (userId: string, publicKey: string): string => { + const encodedKey = CryptoJS.enc.Hex.parse(publicKey.padStart(64, '0')); + + const encrypted = CryptoJS.AES.encrypt(userId, encodedKey, { + mode: CryptoJS.mode.ECB, + }); + + return encrypted.toString(); +}; --- packages/allspark-foundation/Utils/getCorrelationId.ts @@ -0,0 +1,18 @@ +import { v4 as uuidV4 } from 'uuid'; +import { User, UserSelectors } from '../User'; + +export const getCorrelationId = (user: User | null) => { + let correlationId = ''; + + const uniqueId = uuidV4(); + + const countryCode = UserSelectors.getCountryCode(user); + correlationId += `${countryCode || 'US'}-`; + + const siteId = UserSelectors.getSite(user); + if (siteId) { + correlationId += `${siteId}-`; + } + + return `${correlationId}${uniqueId}`; +}; --- packages/allspark-foundation/Utils/index.ts @@ -1,5 +1,7 @@ export { createFallbackInstance } from './createFallback'; export { createGlobalInstance } from './createGlobal'; export { Deferred, DeferredValue } from './deferred'; +export { encryptUserId } from './encryptUserId'; +export { getCorrelationId } from './getCorrelationId'; export { reduxSliceExists } from './reduxSliceExists'; export { retry } from './retry'; --- packages/allspark-foundation/package.json @@ -18,6 +18,7 @@ }, "dependencies": { "axios": "~0.27.2", + "crypto-js": "~4.1.1", "i18next": "~21.9.2", "lodash": "~4.17.21", "react-i18next": "~11.18.6", @@ -35,11 +36,12 @@ "@react-navigation/stack": "~6.3.1", "@walmart/gtp-shared-components": "1.8.9", "moment-timezone": "~0.5.37", - "react": "^17.0.2", + "react": "~17.0.2", "react-native": ">=0.66.0 <0.69.0" }, "devDependencies": { "@react-navigation/stack": "~6.3.1", + "@types/crypto-js": "^4.0.2", "@types/lodash": "~4.14.185", "@types/react": "^17.0.37", "@types/react-redux": "^7.1.9",
refactor: move container utils to foundation
refactor: move container utils to foundation
0c332b21dea90e9499b029ffa0b91cda4bc40233
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.12.2-alpha.1", + "version": "2.12.3", "main": "dist/index.js", "files": [ "dist"
feat(ui): remove wmconnect mini app and add DND status chip from wmconnect shared component
feat(ui): remove wmconnect mini app and add DND status chip from wmconnect shared component
05ab6a46c7eca5b8a2ee753d73a6dade7cf4bf43
--- src/index.tsx @@ -21,6 +21,7 @@ import {PresenceProvider} from './presence/provider'; import {ChannelsProvider} from './channels/provider'; import {RNFBConfigAndroid, RNFBConfigiOS} from './constants'; import {initNotificationListeners} from './notification'; +import {MeganavScreen} from "./screens/MeganavScreen"; export const LOGGER_FIELDS = {id: 'texting-mini-app'}; @@ -52,6 +53,8 @@ export const initialize = async () => { export const initTextingPushNotificationListeners = initNotificationListeners; +export const MeganavTextingScreen = MeganavScreen; + export const TextingMiniApp = () => { const envConfig = useEnvironment(); const dispatch = useDispatch<ThunkDispatch<any, any, any>>(); --- src/navigation/index.tsx @@ -87,14 +87,6 @@ export const TextingNavigation = () => { }} component={SearchScreen} /> - <TextingStack.Screen - name='myTeam.meganavScreen' - options={{ - presentation: 'transparentModal', - header: SearchHeader, - }} - component={MeganavScreen} - /> </TextingStack.Navigator> ); }; --- src/screens/ChannelsScreen.tsx @@ -24,6 +24,10 @@ const styles = StyleSheet.create({ export type ChannelScreenProps = { navigation: StackNavigationProp<TextingNavParamsMap, 'myTeam.tabs'>; + newMessageButtonOffset?: { + x: number; + y: number; + }; }; const keyExtractor = (channel: string) => channel; @@ -35,7 +39,7 @@ const renderChannel: ListRenderItem<string> = ({item: channel}) => { export const ChannelsScreen: React.FC<ChannelScreenProps> = ( props: ChannelScreenProps, ) => { - const {navigation} = props; + const {navigation, newMessageButtonOffset} = props; const channels = useChannelContext(); const onNewMessage = () => { @@ -74,7 +78,16 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = ( ListEmptyComponent={EmptyChannels} /> - <SafeAreaView mode='margin' style={styles.actionButton}> + <SafeAreaView + mode='margin' + style={[ + styles.actionButton, + newMessageButtonOffset && { + position: 'absolute', + bottom: newMessageButtonOffset?.y, + right: newMessageButtonOffset?.x, + }, + ]}> <Button variant='primary' size='large' --- src/screens/MeganavScreen.tsx @@ -121,7 +121,10 @@ export const MeganavScreen: React.FC<MeganavScreenProps> = (props) => { <Text style={styles.headerText}>Messages</Text> </View> </View> - <ChannelsScreen navigation={navigation} /> + <ChannelsScreen + navigation={navigation} + newMessageButtonOffset={{x: 16, y: 95}} + /> <View style={styles.btnInfoContainer}> <View style={styles.rosterBtnInfoContainer}> <Button testID='viewRosterButton' onPress={navigateToRoster}> --- src/index.tsx @@ -21,6 +21,7 @@ import {PresenceProvider} from './presence/provider'; import {ChannelsProvider} from './channels/provider'; import {RNFBConfigAndroid, RNFBConfigiOS} from './constants'; import {initNotificationListeners} from './notification'; +import {MeganavScreen} from "./screens/MeganavScreen"; export const LOGGER_FIELDS = {id: 'texting-mini-app'}; @@ -52,6 +53,8 @@ export const initialize = async () => { export const initTextingPushNotificationListeners = initNotificationListeners; +export const MeganavTextingScreen = MeganavScreen; + export const TextingMiniApp = () => { const envConfig = useEnvironment(); const dispatch = useDispatch<ThunkDispatch<any, any, any>>(); --- src/navigation/index.tsx @@ -87,14 +87,6 @@ export const TextingNavigation = () => { }} component={SearchScreen} /> - <TextingStack.Screen - name='myTeam.meganavScreen' - options={{ - presentation: 'transparentModal', - header: SearchHeader, - }} - component={MeganavScreen} - /> </TextingStack.Navigator> ); }; --- src/screens/ChannelsScreen.tsx @@ -24,6 +24,10 @@ const styles = StyleSheet.create({ export type ChannelScreenProps = { navigation: StackNavigationProp<TextingNavParamsMap, 'myTeam.tabs'>; + newMessageButtonOffset?: { + x: number; + y: number; + }; }; const keyExtractor = (channel: string) => channel; @@ -35,7 +39,7 @@ const renderChannel: ListRenderItem<string> = ({item: channel}) => { export const ChannelsScreen: React.FC<ChannelScreenProps> = ( props: ChannelScreenProps, ) => { - const {navigation} = props; + const {navigation, newMessageButtonOffset} = props; const channels = useChannelContext(); const onNewMessage = () => { @@ -74,7 +78,16 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = ( ListEmptyComponent={EmptyChannels} /> - <SafeAreaView mode='margin' style={styles.actionButton}> + <SafeAreaView + mode='margin' + style={[ + styles.actionButton, + newMessageButtonOffset && { + position: 'absolute', + bottom: newMessageButtonOffset?.y, + right: newMessageButtonOffset?.x, + }, + ]}> <Button variant='primary' size='large' --- src/screens/MeganavScreen.tsx @@ -121,7 +121,10 @@ export const MeganavScreen: React.FC<MeganavScreenProps> = (props) => { <Text style={styles.headerText}>Messages</Text> </View> </View> - <ChannelsScreen navigation={navigation} /> + <ChannelsScreen + navigation={navigation} + newMessageButtonOffset={{x: 16, y: 95}} + /> <View style={styles.btnInfoContainer}> <View style={styles.rosterBtnInfoContainer}> <Button testID='viewRosterButton' onPress={navigateToRoster}>
adding megnav screen
adding megnav screen
97508cca6a79037ebdef1520c74abcc130aa2bbf
--- packages/allspark-foundation-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.25.23](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.25.22...@walmart/allspark-foundation-hub@1.25.23) (2025-12-17) + +**Note:** Version bump only for package @walmart/allspark-foundation-hub + ## [1.25.22](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.25.21...@walmart/allspark-foundation-hub@1.25.22) (2025-12-16) **Note:** Version bump only for package @walmart/allspark-foundation-hub --- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.25.22", + "version": "1.25.23", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", --- packages/allspark-foundation/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. +## [7.17.3](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.17.2...@walmart/allspark-foundation@7.17.3) (2025-12-17) + +### Bug Fixes + +- **ui:** fixed warning badge on hamburger menu ([#538](https://gecgithub01.walmart.com/allspark/allspark/issues/538)) ([816d9bd](https://gecgithub01.walmart.com/allspark/allspark/commit/816d9bd9e326b0150d4c7d267698e416b07c81e0)) + ## [7.17.2](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.17.1...@walmart/allspark-foundation@7.17.2) (2025-12-16) **Note:** Version bump only for package @walmart/allspark-foundation --- packages/allspark-foundation/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation", - "version": "7.17.2", + "version": "7.17.3", "description": "", "main": "Core/index.js", "types": "Core/index.d.ts", --- 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.8.4](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/my-walmart-hub@1.8.3...@walmart/my-walmart-hub@1.8.4) (2025-12-17) + +**Note:** Version bump only for package @walmart/my-walmart-hub + ## [1.8.3](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/my-walmart-hub@1.8.2...@walmart/my-walmart-hub@1.8.3) (2025-12-16) **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.8.3", + "version": "1.8.4", "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/allspark-foundation@7.17.3 - @walmart/allspark-foundation-hub@1.25.23 - @walmart/my-walmart-hub@1.8.4
bfe55bbe32d6f0e39120054115a439bfae15e68b
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "3.8.0-beta.7", + "version": "3.8.0-beta.8", "main": "dist/index.js", "files": [ "dist", --- src/components/MyWalmartv2/Widgets/Hourly/HourlyRosterWidget.tsx @@ -28,6 +28,7 @@ import {useTeamBasedDCRoster} from '../../../../hooks/useTeamBasedDCRoster'; import {handleViewAssociateSchedule} from '../../../../utils/rosterDetail'; import {RosterSearch} from '../../Common/RosterSearch/RosterSearch'; import {RosterEmptyState} from '../../Common/RosterEmptyState/RosterEmptyState'; +import {useIsImpersonatedOnDev, useUserIsInRoster} from '../../../../hooks/user'; /** * @typedef {Object} Punch @@ -166,6 +167,9 @@ const ListItem = memo( // Get siteId at component level (not in callback) const siteId: string | undefined = useSelector(UserSelectors.getWorkingSite); + const userIsInRoster = useUserIsInRoster(); + const userIsImpersonatedOnDev = useIsImpersonatedOnDev(); + // Extract schedule data similar to RosterListItem const scheduleData = useMemo(() => { const {wfmSchedule, storeSchedule} = associate; @@ -247,8 +251,15 @@ const ListItem = memo( id="wmConnect.RosterMessageButton" props={{ associate: associate, - disabled: false, + disabled: !userIsInRoster || !userIsImpersonatedOnDev, isFullWidth: true, + accessibilityLabel: `${t('rosterScreen.message', 'Message')} ${ + fullName || displayName + }`, + accessibilityHint: t( + 'rosterScreen.messageButtonHint', + 'Double tap to message this associate' + ), }} /> ) : undefined --- src/screens/MyWalmartV2/Hoc/AssociateRosterDetailHoc.tsx @@ -19,6 +19,7 @@ import {TOTAL_SITE_TEAM_ID} from '@walmart/my-walmart-hub'; import {handleViewAssociateSchedule} from '../../../utils/rosterDetail'; import {goToWeeklySchedule} from '../../../navigation/utils'; import {associateIsScheduled} from '../../../utils/user'; +import {useUserIsInRoster, useIsImpersonatedOnDev} from '../../../hooks/user'; // Extended type for our use case that includes the original FilterValue plus additional values type RosterFilterValue = FilterValue | 'all' | ''; @@ -55,7 +56,10 @@ export const AssociateRosterDetailHoc = () => { const workContext = useSelector(WorkSelectors.getContext); // Extract team ID from the work context structure - const selectedTeamIds = workContext?.teamId ? [String(workContext.teamId)] : []; + const selectedTeamIds = useMemo( + () => workContext?.teamId ? [String(workContext.teamId)] : [], + [workContext?.teamId] + ); const selectedTeamName = workContext?.teamLabel || 'all'; // Extract shift data from Work Context (for DC environments) @@ -141,6 +145,11 @@ export const AssociateRosterDetailHoc = () => { const viewerTeamIds: (string | null)[] | undefined = useSelector( UserSelectors.getTeamIds ); + + // User permissions for Group Message Button + const userIsInRoster = useUserIsInRoster(); + const userIsImpersonatedOnDev = useIsImpersonatedOnDev(); + const primaryTeamId = useMemo( () => (viewerTeamIds?.find((id) => !!id) as string) || 'all', [viewerTeamIds] @@ -268,9 +277,13 @@ export const AssociateRosterDetailHoc = () => { selectedFilter: (selectedFilter === 'all' || selectedFilter === '') ? '' as FilterValue : selectedFilter as FilterValue, onFilterPress: handleFilterPress, }, + // Group Message Button props + teamIds: selectedTeamIds, + userIsInRoster, + userIsImpersonatedOnDev, onRefresh, }), - [siteIsDC, isSalaried, filteredAssociates, rosterLoading, rosterError, associates.length, searchQuery, rosterFilters, selectedFilter, handleFilterPress, onRefresh, siteId, countryCode, viewWeeklySchedule, hasScheduleData, scheduledCount, isRefreshing] + [siteIsDC, isSalaried, filteredAssociates, rosterLoading, rosterError, associates.length, searchQuery, rosterFilters, selectedFilter, handleFilterPress, onRefresh, siteId, countryCode, viewWeeklySchedule, hasScheduleData, scheduledCount, isRefreshing, selectedTeamIds, userIsInRoster, userIsImpersonatedOnDev] );
fix: update config for group message buttons
fix: update config for group message buttons
d0356afba7ea6176412242ba6e00bcf3a85fac75
--- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.0.0", + "version": "1.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/myteam-mini-app", - "version": "1.0.0", + "version": "1.0.1", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.20.0", --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.0.0", + "version": "1.0.1", "private": false, "main": "dist/index.js", "files": [
Update version for myteam
Update version for myteam
c5ea40d556618d47e68f2c7e95e1d3f758b9a9a1
--- docs/CHANGELOG.md @@ -1,3 +1,12 @@ +# [1.40.0](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.39.0...v1.40.0) (2025-06-24) + + +### Features + +* **ui:** adding extra space ([3b08ee2](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/3b08ee2c5bb762d69630e46a2e08953d0f214989)) +* **ui:** dding yarn lock changes ([f29dbad](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/f29dbad2b2433f9227aa9fae35e683f2a0f55b5d)) +* **ui:** updating roster wmconnect versions ([023856a](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/023856ae650c62abbaa6f89e82c7a9c2ba36b81c)) + # [1.39.0](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.38.0...v1.39.0) (2025-06-05) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.39.0", + "version": "1.40.0", "main": "dist/index.js", "files": [ "dist",
chore(release): 1.40.0 [skip ci]
chore(release): 1.40.0 [skip ci] # [1.40.0](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.39.0...v1.40.0) (2025-06-24) ### Features * **ui:** adding extra space ([3b08ee2](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/3b08ee2c5bb762d69630e46a2e08953d0f214989)) * **ui:** dding yarn lock changes ([f29dbad](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/f29dbad2b2433f9227aa9fae35e683f2a0f55b5d)) * **ui:** updating roster wmconnect versions ([023856a](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/023856ae650c62abbaa6f89e82c7a9c2ba36b81c))
868ff34bb2499c4c6401e97fc5586fcbf8a5ed55
--- .looper.multibranch.yml @@ -111,7 +111,6 @@ flows: catch: - | rm -rf node_modules - cd android && ./gradlew --stop && ./gradlew clean - call: yarn-steps - call: build-android-app catch:
chore: remove clean phase
chore: remove clean phase
ff780dddec45aa9f236609546c2a2cf92e865d7b
--- package-lock.json @@ -63,7 +63,7 @@ "@walmart/moment-walmart": "1.0.4", "@walmart/OneWalmart-MiniApp": "1.0.12", "@walmart/pay-stub-miniapp": "0.9.28", - "@walmart/payrollsolution_miniapp": "0.130.27", + "@walmart/payrollsolution_miniapp": "0.130.28", "@walmart/price-changes-mini-app": "1.6.10", "@walmart/profile-feature-app": "0.76.0", "@walmart/push-to-talk-mini-app": "1.8.59", @@ -5634,9 +5634,9 @@ } }, "node_modules/@walmart/payrollsolution_miniapp": { - "version": "0.130.27", - "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.130.27.tgz", - "integrity": "sha512-K0/rMItV9UJ9Re39yq2Wp4ZOzFyZjYaQPEx4WZwviYdM3JC9MGWWxdb+VurZhn/A2BsC4oZ90aWJ1xzM+GvhMQ==", + "version": "0.130.28", + "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.130.28.tgz", + "integrity": "sha512-TRCZOn9YA5PUQbZtoPwCYc+g/iyqI4GO28ZUPRWF8sXjRTTKrVuw3A15oITMdVO0jQgUyCcK3aGmmSG8PHo3Yg==", "dependencies": { "crypto-js": "^3.3.0" }, @@ -25309,9 +25309,9 @@ } }, "@walmart/payrollsolution_miniapp": { - "version": "0.130.27", - "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.130.27.tgz", - "integrity": "sha512-K0/rMItV9UJ9Re39yq2Wp4ZOzFyZjYaQPEx4WZwviYdM3JC9MGWWxdb+VurZhn/A2BsC4oZ90aWJ1xzM+GvhMQ==", + "version": "0.130.28", + "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.130.28.tgz", + "integrity": "sha512-TRCZOn9YA5PUQbZtoPwCYc+g/iyqI4GO28ZUPRWF8sXjRTTKrVuw3A15oITMdVO0jQgUyCcK3aGmmSG8PHo3Yg==", "requires": { "crypto-js": "^3.3.0" } --- package.json @@ -105,7 +105,7 @@ "@walmart/moment-walmart": "1.0.4", "@walmart/OneWalmart-MiniApp": "1.0.12", "@walmart/pay-stub-miniapp": "0.9.28", - "@walmart/payrollsolution_miniapp": "0.130.27", + "@walmart/payrollsolution_miniapp": "0.130.28", "@walmart/price-changes-mini-app": "1.6.10", "@walmart/profile-feature-app": "0.76.0", "@walmart/push-to-talk-mini-app": "1.8.59",
bump version
bump version
7067cedfe0b53d481c4b0b52bf5411cef12b9866
--- src/hooks/teams.ts @@ -10,8 +10,8 @@ import {getGraphQLConfig} from '../services/config'; import {UserSelectors} from '@walmart/allspark-foundation/User'; import {SiteSelectors} from '@walmart/allspark-foundation/Site'; import { - MY_TEAMS_TEAM_LABEL, - TOTAL_STORE_TEAM_LABEL, + MY_TEAMS_TEAM_ID, + TOTAL_STORE_TEAM_ID, } from '@walmart/allspark-foundation-hub/HubFeature/constant'; export const useGetTeamById = (teamId: string) => { @@ -33,8 +33,8 @@ export const useGetTeamById = (teamId: string) => { !storeNbr || !countryCode || !teamId || - teamId === TOTAL_STORE_TEAM_LABEL || - teamId === MY_TEAMS_TEAM_LABEL, + teamId === TOTAL_STORE_TEAM_ID || + teamId === MY_TEAMS_TEAM_ID, notifyOnNetworkStatusChange: true, context: getGraphQLConfig(envConfig), onError(error) { --- src/managerExperience/screens/RosterDetailScreen/RosterDetailScreen.tsx @@ -13,6 +13,7 @@ import { useGetTeamById, useGetTeamsByStore, useGetViewersPrimaryTeamId, + useGetViewersPrimaryTeamName, } from '../../../hooks'; import {useSelector} from 'react-redux'; import {teamLeadJobDescriptions} from '../../../redux/selectors'; @@ -55,8 +56,10 @@ import {AllsparkSharedComponents} from '@walmart/allspark-foundation/Components' import {RosterDetailScreenProps} from './types'; export const RosterDetailScreen = ({route}: RosterDetailScreenProps) => { - const initialTeamId = route.params.teamId; - const initialTeamName = route.params.teamName; + const primaryTeamId = useGetViewersPrimaryTeamId(); + const primaryTeamName = useGetViewersPrimaryTeamName(); + const initialTeamId = route.params?.teamId ?? primaryTeamId; + const initialTeamName = route.params?.teamName ?? primaryTeamName; const {t} = translationClient.useTranslation(); const {bottom: bottomInset} = useSafeAreaInsets(); const navigation = useNavigation<StackNavigationProp<TextingNavParamsMap>>(); @@ -72,7 +75,6 @@ export const RosterDetailScreen = ({route}: RosterDetailScreenProps) => { const isTeamLead: boolean = useSelector(UserSelectors.getIsUserTeamLead); const isSalaried: boolean = useSelector(UserSelectors.getIsUserSalaried); const isSalariedOrLead = isTeamLead || isSalaried || isPeopleLead; - const primaryTeamId = useGetViewersPrimaryTeamId(); const selectedTeamPreference = useSelector(ManagerExperienceSelectors.getSelectedTeamPreference) ?? TOTAL_STORE_TEAM_LABEL; @@ -83,13 +85,20 @@ export const RosterDetailScreen = ({route}: RosterDetailScreenProps) => { teamLabel: initialTeamName ?? selectedTeamPreference, teamIds: ([initialTeamId] as string[]) ?? selectedTeamIds, }); - const isPrimaryTeam = primaryTeamId === teamState.teamLabel; + const isPrimaryTeam = primaryTeamId === teamState.teamIds?.[0]; const AllsparkImage = useAllsparkImage(); const currentSiteId = useSelector(UserSelectors.getSiteId); const parentSiteID = useRef(currentSiteId); + useEffect(() => { + setTeamState({ + teamLabel: initialTeamName ?? selectedTeamPreference, + teamIds: ([initialTeamId] as string[]) ?? selectedTeamIds, + }); + }, [initialTeamName, initialTeamId]); + /**Refresh props */ const [state, setState] = useState<{ refreshTime: string | null; @@ -106,7 +115,7 @@ export const RosterDetailScreen = ({route}: RosterDetailScreenProps) => { loading: teamLoading, data: currentTeamData, error: teamError, - } = useGetTeamById(teamState.teamLabel); + } = useGetTeamById(teamState.teamIds?.[0]); const { loading: rosterLoading, data: rosterData, @@ -127,7 +136,7 @@ export const RosterDetailScreen = ({route}: RosterDetailScreenProps) => { if (currentTeam?.teamName) { return currentTeam?.teamName; } else { - if (teamState.teamLabel === TOTAL_STORE_TEAM_ID) { + if (teamState.teamIds?.[0] === TOTAL_STORE_TEAM_ID) { return t('rosterScreen.storeChatCard.title'); } else { return t('rosterScreen.teamWorkgroup.myTeam'); @@ -140,7 +149,7 @@ export const RosterDetailScreen = ({route}: RosterDetailScreenProps) => { const teamRoster = rosterData ? (generateTeamRoster( - teamState.teamLabel, + teamState.teamIds?.[0], rosterData, currentTeam, selectedTeamIds, @@ -150,7 +159,7 @@ export const RosterDetailScreen = ({route}: RosterDetailScreenProps) => { //Todo: Move some of the functions to utils or hooks const filterCount = useMemo(() => { - if (teamState.teamLabel === TOTAL_STORE_TEAM_ID) { + if (teamState.teamIds?.[0] === TOTAL_STORE_TEAM_ID) { return { scheduledCount: teamRoster?.length, clockedInCount: teamRoster?.filter(associateIsClockedIn)?.length, @@ -338,7 +347,7 @@ export const RosterDetailScreen = ({route}: RosterDetailScreenProps) => { ) : ( <RosterDetailPageHeader header={currentTeamName} - teamId={teamState.teamLabel} + teamId={teamState.teamIds?.[0]} handleNavigation={() => { analytics('view_all_teams', { message: 'Navigate to all teams screen',
Update roster mini app version
Update roster mini app version
2c56b26779c5a405e4935ae54e46dc9efd633203
--- .looper.yml @@ -14,7 +14,7 @@ flows: pr: - (name Corepack enable) corepack enable - - (name Yarn Set Version) yarn set version 4.1.1 + - (name Yarn Set Version) yarn set version 4.4.0 - (name Yarn Version) yarn --version - yarn install - yarn run lint
Update version for roster mini app
Update version for roster mini app
4937462765bd67bd344aece6d2940c5f1bb8a2d1
--- .looper.yml @@ -24,4 +24,4 @@ flows: - (name Yarn Version) yarn --version - yarn install - yarn run lint - - yarn run coverage \ No newline at end of file + - yarn run coverage
feat(ui): update packages
feat(ui): update packages
c21ad0c9e11365314fe68eea6bc0e4a67fc9f01b
--- __tests__/harness/athenaQueries/getTeamsByStore.ts @@ -1,4 +1,4 @@ -import {GetTeamsByStoreDocument} from '../../../dist/queries/getTeamsbyStore'; +import {GetTeamsByStoreDocument} from '../../../src/queries/getTeamsbyStore'; import moment from 'moment-timezone'; const currentDay = moment().format('YYYY-MM-DD'); --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.2.1", + "version": "1.2.0", "main": "dist/index.js", "files": [ "dist"
Update mini app versions
Update mini app versions
e6c37a8aceb8d98a6a12bdfc4c8a274467183c4b
--- __tests__/harness/redux/mockState/userState.ts @@ -1,7 +1,11 @@ import {User, UserState} from '@walmart/redux-store'; +// @ts-ignore import {hourlyUserData} from './mockUsers/hourlyUser'; +// @ts-ignore import {peopleLeadUserData} from './mockUsers/peopleLead'; +// @ts-ignore import {salariedUserData} from './mockUsers/salariedUser'; +// @ts-ignore import {teamLeadUserData} from './mockUsers/teamLead'; const generateUserState = (userData: User): UserState => { --- __tests__/harness/redux/mockState/userState.ts @@ -1,7 +1,11 @@ import {User, UserState} from '@walmart/redux-store'; +// @ts-ignore import {hourlyUserData} from './mockUsers/hourlyUser'; +// @ts-ignore import {peopleLeadUserData} from './mockUsers/peopleLead'; +// @ts-ignore import {salariedUserData} from './mockUsers/salariedUser'; +// @ts-ignore import {teamLeadUserData} from './mockUsers/teamLead'; const generateUserState = (userData: User): UserState => {
adding ts ignore to userState
adding ts ignore to userState
e639a568802985b83ee20456c3040dcd379b4dcf
--- packages/allspark-foundation/__tests__/Site/selectors.test.tsx @@ -4,8 +4,13 @@ import { divisionIsStore, divisionIsDC, getPrimaryContact, + SiteSelectors, + bannerCode, + bannerDescription, } from '../../src/Site/selectors'; +const { getHomeSiteBannerCode, getHomeSiteBannerDescription, getWorkingSiteBannerCode, getWorkingSiteBannerDescription } = SiteSelectors; + describe('Address and Location Functions', () => { let address = { addressLine1: '321 Elm St', @@ -163,3 +168,69 @@ describe('Address and Location Functions', () => { expect(divisionIsDC('44')).toBe(true); }); }); + +describe('Banner Selectors', () => { + describe('Banner Functions', () => { +it('should return the correct banner code', () => { + const banner = { code: 'B123', description: 'Test Banner' }; + expect(bannerCode(banner)).toBe('B123'); +}); + +it('should return undefined if banner is not provided', () => { + expect(bannerCode()).toBeUndefined(); +}); + +it('should return the correct banner description', () => { + const banner = { code: 'B123', description: 'Test Banner'}; + expect(bannerDescription(banner)).toBe('Test Banner'); +}); + +it('should return undefined if banner is not provided', () => { + expect(bannerDescription()).toBeUndefined(); +}); + +it('should handle null banner', () => { + expect(bannerCode(null)).toBeUndefined(); + expect(bannerDescription(null)).toBeUndefined(); +}); + }); + + describe("banner selectors", () => { + const mockState = () => ({ + site: { + homeSite:{ + data: { + banner: { + code: 'A1', + description: 'WM SuperCenter' + } + } + }, + workingSite: { + data: { + banner: { + code: 'D1', + description: 'Distribution center' + } + } + } + } + }); + + it("getHomeSiteBannerCode", () => { + expect(getHomeSiteBannerCode(mockState())).toBe("A1") + }); + + it("getHomeSiteBannerDescription", () => { + expect(getHomeSiteBannerDescription(mockState())).toBe("WM SuperCenter") + }); + + it("getWorkingSiteBannerCode", () => { + expect(getWorkingSiteBannerCode(mockState())).toBe("D1") + }); + + it("getWorkingSiteBannerDescription", () => { + expect(getWorkingSiteBannerDescription(mockState())).toBe("Distribution center") + }); + }); +}); --- packages/allspark-foundation/src/Site/selectors.ts @@ -6,7 +6,7 @@ import { generateSubSelectors, } from '../Redux/utils'; import { siteSlice } from './redux'; -import { Address, Contact, Location } from './types'; +import { Address, Banner, Contact, Location } from './types'; const GeneratedSelectors = generateSelectorsForSlice(siteSlice); @@ -19,6 +19,7 @@ const WorkingSiteBaseSelectors = generateSubSelectors( const WorkingSiteDetailSelectors = generateSubSelectors( WorkingSiteBaseSelectors.getWorkingSiteData, [ + 'banner', 'contacts', 'country', 'currency', @@ -80,6 +81,7 @@ const HomeSiteBaseSelectors = generateSubSelectors( const HomeSiteDetailSelectors = generateSubSelectors( HomeSiteBaseSelectors.getHomeSiteData, [ + 'banner', 'contacts', 'country', 'currency', @@ -185,6 +187,28 @@ const getHomeSitePrimaryContact = createSelector( getPrimaryContact ); +export const bannerCode = (banner?: Banner) => banner?.code; +export const bannerDescription = (banner?: Banner) => banner?.description; + +const getHomeSiteBannerCode = createSelector( + [HomeSiteDetailSelectors.getHomeSiteBanner], + bannerCode +); + +const getWorkingSiteBannerCode = createSelector( + [WorkingSiteDetailSelectors.getWorkingSiteBanner], + bannerCode +); + +const getHomeSiteBannerDescription = createSelector( + [HomeSiteDetailSelectors.getHomeSiteBanner], + bannerDescription +); +const getWorkingSiteBannerDescription = createSelector( + [WorkingSiteDetailSelectors.getWorkingSiteBanner], + bannerDescription +); + /** * A collection of selectors for retrieving site data from the Redux store. * @example @@ -249,4 +273,8 @@ export const SiteSelectors = { [HomeSiteDivisionSelectors.getHomeSiteDivisionCode], divisionIsDC ), + getHomeSiteBannerCode, + getHomeSiteBannerDescription, + getWorkingSiteBannerCode, + getWorkingSiteBannerDescription, }; --- packages/allspark-foundation/src/Site/types.ts @@ -81,10 +81,17 @@ export type Division = { description: string; }; +export type Banner = { + code: string; + description: string; + id?: string; +}; + /** * Represents a physical location */ export type Site = { + banner?: Banner; country: string; siteId: number; division: Division;
feat (site): add banner to typing and generated selector
feat (site): add banner to typing and generated selector * adding banner support for site * Update packages/allspark-foundation/__tests__/Site/selectors.test.tsx Co-authored-by: AI Code Assistant <AI-Code-Assistant@email.wal-mart.com> --------- Co-authored-by: AI Code Assistant <AI-Code-Assistant@email.wal-mart.com>
6d15d0e563654ffcdeebbf296bbf525bbd99a76f
--- packages/associate-exp-hub-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. +## [2.21.6](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-hub@2.21.5...@walmart/associate-exp-hub-hub@2.21.6) (2026-01-16) + +**Note:** Version bump only for package @walmart/associate-exp-hub-hub + ## [2.21.5](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-hub@2.21.4...@walmart/associate-exp-hub-hub@2.21.5) (2026-01-13) **Note:** Version bump only for package @walmart/associate-exp-hub-hub --- packages/associate-exp-hub-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/associate-exp-hub-hub", - "version": "2.21.5", + "version": "2.21.6", "description": "Hub Framework module for Associate Experience Hub - can be moved to @walmart/my-walmart-hub", "packageManager": "yarn@4.6.0", "engines": { --- packages/associate-exp-hub-mini-app/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.14.4](https://gecgithub01.walmart.com/smdv/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-mini-app@1.14.3...@walmart/associate-exp-hub-mini-app@1.14.4) (2026-01-16) + +### Bug Fixes + +- **ui:** MyWalmart 2.0 VQA Bugs ([7504526](https://gecgithub01.walmart.com/smdv/associate-exp-hub-mini-app/commit/75045263131f4a871359ec2943bcd7142682a7cf)) + ## [1.14.3](https://gecgithub01.walmart.com/smdv/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-mini-app@1.14.2...@walmart/associate-exp-hub-mini-app@1.14.3) (2026-01-13) ### Bug Fixes --- packages/associate-exp-hub-mini-app/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/associate-exp-hub-mini-app", - "version": "1.14.3", + "version": "1.14.4", "packageManager": "yarn@4.6.0", "engines": { "node": ">=18" --- packages/associate-exp-hub-team-switcher/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. +## [2.25.2](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-team-switcher@2.25.1...@walmart/associate-exp-hub-team-switcher@2.25.2) (2026-01-16) + +### Bug Fixes + +- **ui:** MyWalmart 2.0 VQA Bugs ([7504526](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/commit/75045263131f4a871359ec2943bcd7142682a7cf)) + ## [2.25.1](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-team-switcher@2.25.0...@walmart/associate-exp-hub-team-switcher@2.25.1) (2026-01-13) ### Bug Fixes --- packages/associate-exp-hub-team-switcher/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/associate-exp-hub-team-switcher", - "version": "2.25.1", + "version": "2.25.2", "description": "Team Switcher module for Associate Experience Hub", "packageManager": "yarn@4.6.0", "engines": {
chore(version): updating package version
chore(version): updating package version - @walmart/associate-exp-hub-hub@2.21.6 - @walmart/associate-exp-hub-mini-app@1.14.4 - @walmart/associate-exp-hub-team-switcher@2.25.2
616f451bfea46fea814695ddd54aa59f3202361c
--- targets/US/ios/Podfile.lock @@ -2254,7 +2254,7 @@ PODS: - FirebaseMessaging (<= 10.18.0) - StructuredLogAssistantIOS (= 0.0.7) - TOCropViewController (2.7.4) - - topstock-mini-app (1.15.20): + - topstock-mini-app (1.16.16): - React - VisionCamera (3.7.1): - React @@ -2917,7 +2917,7 @@ SPEC CHECKSUMS: StructuredLogAssistantIOS: d48c327b3b67366d954435891dc1e748a6aeb9c1 SumoSDK: 58664bf3b83e2f4bcdfc52704235ab4bca519ceb TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654 - topstock-mini-app: a96504a14b0e8ef2c9a9fbc591642ea9743d90d4 + topstock-mini-app: 6a405a5c76659df7c52599b004f15c4a6b84a3c2 VisionCamera: ef56ac9d3e0fef4b94c7cf75735aaccc2326e35a walmart-react-native-sumo-sdk: a6dc20c0ec3c8ab878886529a0e2fc22e747821c WebexSDK: d652713bd7ad5902e81918121912ba75a0056c3b
update podlock file
update podlock file
c7282bf863d72ab6efa345e37e6b5c9f9f9d33d6
--- package.json @@ -105,6 +105,7 @@ "!<rootDir>/src/navigation/Navigation.tsx", "!<rootDir>/src/navigation/NavigationStyle.ts" ], + "coverageReporters": ["lcov"], "coverageThreshold": { "global": { "statements": 95,
Chore/hygieia reporting (#32)
Chore/hygieia reporting (#32) * added lcov coverage for Hygieia
e20dd012edf45dbc8026c50049ce3bb84a626980
--- package-lock.json @@ -58,7 +58,7 @@ "@walmart/core-widget-registry": "6.0.2", "@walmart/counts-component-miniapp": "0.1.10", "@walmart/emergency-mini-app": "1.27.0", - "@walmart/exception-mini-app": "1.7.4", + "@walmart/exception-mini-app": "1.7.9", "@walmart/facilities-management-miniapp": "0.8.1", "@walmart/feedback-all-spark-miniapp": "0.9.58", "@walmart/financial-wellbeing-feature-app": "1.20.1", @@ -11266,9 +11266,9 @@ } }, "node_modules/@walmart/exception-mini-app": { - "version": "1.7.4", - "resolved": "https://npme.walmart.com/@walmart/exception-mini-app/-/exception-mini-app-1.7.4.tgz", - "integrity": "sha512-tNTDiVtWXZhVur+SAWUjGFMa0xHVQQjHGR9JLcTQTz2cGk5+/JT0+9UzslJguzeI48HSRIPOAOZbEwam5IzGVQ==", + "version": "1.7.9", + "resolved": "https://npme.walmart.com/@walmart/exception-mini-app/-/exception-mini-app-1.7.9.tgz", + "integrity": "sha512-araFuJCXmqxj3T2HRfFdNsLFSeuiSVpHoQjTp0Hnrasael6yImumILbAlP9l5ffw+bWKeJ1GmLSk7lLLPxIqZA==", "peerDependencies": { "@walmart/core-services": "^2.0.15", "@walmart/core-services-allspark": "^2.10.3", --- package.json @@ -99,7 +99,7 @@ "@walmart/core-widget-registry": "6.0.2", "@walmart/counts-component-miniapp": "0.1.10", "@walmart/emergency-mini-app": "1.27.0", - "@walmart/exception-mini-app": "1.7.4", + "@walmart/exception-mini-app": "1.7.9", "@walmart/facilities-management-miniapp": "0.8.1", "@walmart/feedback-all-spark-miniapp": "0.9.58", "@walmart/financial-wellbeing-feature-app": "1.20.1", @@ -359,7 +359,7 @@ "@walmart/core-widget-registry": "6.0.2", "@walmart/counts-component-miniapp": "0.1.10", "@walmart/emergency-mini-app": "1.27.0", - "@walmart/exception-mini-app": "1.7.4", + "@walmart/exception-mini-app": "1.7.9", "@walmart/facilities-management-miniapp": "0.8.1", "@walmart/feedback-all-spark-miniapp": "0.9.58", "@walmart/financial-wellbeing-feature-app": "1.20.1",
Exception-1.7.9
Exception-1.7.9
a0fe744c56466d17de3a8df50b7a37d925fb5c77
--- core/__tests__/__mocks__/@walmart/allspark-foundation/Environment.js @@ -0,0 +1,22 @@ +module.exports = { + ...jest.requireActual('@walmart/allspark-foundation/Environment'), +useEnvironment: jest.fn(() => ({ auth: {associate: {"clientId": "MeAtWMT"}} })), + + AllsparkEnvironment: { + resolveDerivedValue: jest.fn(), + initialize: jest.fn(), + getCurrent: jest.fn(() => ({ consumerId:'mock-consumer-id' })), + getDeferred: jest.fn(), + VALUES: { + appConsumerId: 'appConsumerId', + deployment: 'prod' + }, + _environment: { + current: { + deployment: 'dev' + } + } + }, + + }; + \ No newline at end of file --- core/__tests__/home/services/HomeApi/indexTest.ts @@ -45,7 +45,7 @@ describe('getFullUrlForRoute', () => { const url = await getFullUrlForRoute('anniversary'); expect(logGeneralError).toHaveBeenCalled(); expect(url).toEqual( - 'https://developer.api.us.stg.walmart.com/api-proxy/service/allspark/wcnp-anniversary/v1/', + 'https://developer.api.us.walmart.com/api-proxy/service/allspark/wcnp-anniversary/v1/', ); }); }); @@ -64,7 +64,7 @@ describe('Routes', () => { timeZone: 'America/Chicago', }); expect(BaseHomeApi.get).toHaveBeenCalledWith( - 'https://developer.api.us.stg.walmart.com/api-proxy/service/allspark/wcnp-anniversary/v1/anniversaries/homescreen?storeNbr=100&domain=Store/club&userId=sam.s00100&siteTimeZone=America/Chicago', + 'https://developer.api.us.walmart.com/api-proxy/service/allspark/wcnp-anniversary/v1/anniversaries/homescreen?storeNbr=100&domain=Store/club&userId=sam.s00100&siteTimeZone=America/Chicago', { cache: { ttl: 24 * 60 * 60000, @@ -80,7 +80,7 @@ describe('Routes', () => { mockGetRouteConfig.mockReturnValueOnce(undefined); await HomeApi.getClockStatusForTeam(kQueryGraphVariables); expect(BaseHomeApi.post).toHaveBeenCalledWith( - 'https://developer.api.us.stg.walmart.com/api-proxy/service/Associate/Read-Orchestrator/v1/graphql', + 'https://developer.api.us.walmart.com/api-proxy/service/Associate/Read-Orchestrator/v1/graphql', { query: ` query ($storeId: String!, $teamId: String!, $countryCode: String!, $date: Date! ) { @@ -108,7 +108,7 @@ describe('Routes', () => { mockGetRouteConfig.mockReturnValueOnce(undefined); await HomeApi.getClockStatusForStore(kQueryGraphVariables); expect(BaseHomeApi.post).toHaveBeenCalledWith( - 'https://developer.api.us.stg.walmart.com/api-proxy/service/Associate/Read-Orchestrator/v1/graphql', + 'https://developer.api.us.walmart.com/api-proxy/service/Associate/Read-Orchestrator/v1/graphql', { query: ` query($storeId: String!, $countryCode: String!, $date: Date!) { --- core/__tests__/settings/versions/__snapshots__/VersionsListTest.tsx.snap @@ -20,7 +20,7 @@ exports[`VersionsList 1`] = ` [ { "data": [], - "title": "Me@Walmart", + "title": "", "version": null, }, ] @@ -65,7 +65,7 @@ exports[`VersionsList 1`] = ` size="medium" weight="700" > - appNames.Me@Walmart + appNames. </Body> <Body size="medium"
added allspartkenvironment in the mock
added allspartkenvironment in the mock
69e5b9e3caebdcc4554bbd4f5d6dc8f6ba929fba
--- packages/core-widget-registry/src/Sidekick.ts @@ -5,12 +5,25 @@ import { useRegistry, WidgetRegistry } from '@walmart/allspark-utils'; export type PayloadType = 'ok' | 'stale' | 'failed'; export interface SidekickWidgetProps { - onNetworkCallback?: (payloadStatus: PayloadType) => void; + /** Will be called when the truck freight list is done loading. Provides 3 states: + * * 'ok': Fetched truck freight data successfully + * * 'error': API failed + * * 'stale': Was unable to fetch latest data, but was able to use cached data + */ + onNetworkCallback?: (fetchResult: PayloadType) => void; + /** Limit how many truck freights to show. Will show all, if not specified. */ maxItems?: number; + /** + * Filter the truck freight list by certain options + * * trailerIds: Only show truck freights with these trailer IDs + */ filterBy?: { trailerIds?: string[]; }; + /** Container style */ style?: StyleProp<ViewStyle>; + /** Individual card style */ + cardStyle?: StyleProp<ViewStyle>; } type SidekickWidgetMap = Record<string, FunctionComponent<SidekickWidgetProps>>;
updated sidekick widget props
updated sidekick widget props
7426a62e5489bd09388839177a25af0109eb0e5a
--- package-lock.json @@ -3328,9 +3328,9 @@ "integrity": "sha512-5cla0k4tS7an8zHF5Fn8udmss3AsWs1UXPV/QwC0W49L/BD6SK+I6TcuPnEnGugOS718JTgMSG32iPED/yOSIA==" }, "@walmart/exception-mini-app": { - "version": "0.28.0-rc.11", - "resolved": "https://npme.walmart.com/@walmart/exception-mini-app/-/exception-mini-app-0.28.0-rc.11.tgz", - "integrity": "sha512-BLuytnF1hUmtxofNI5HnMk39hfpSY6bT37BMx8e3int8+fYd68K7vEKK1UPwLJVOhIUW8cZ1J/njESEUCrfIeA==" + "version": "0.28.0-rc.15", + "resolved": "https://npme.walmart.com/@walmart/exception-mini-app/-/exception-mini-app-0.28.0-rc.15.tgz", + "integrity": "sha512-xhI5bNDfk1v/1Fq5IGpLl00gXyh31v1rmE80EtGGUNA3AIz+NmPu50jc1bn3bvYaZICuar3FPpnIMrYSMXuEGA==" }, "@walmart/feedback-all-spark-miniapp": { "version": "0.0.55",
adding missing lock file
adding missing lock file
f030c0d0555391434ab2f523d7d83564e8193d1f
--- __tests__/navigation/AssociateHallwayNav/__snapshots__/SideMenuContentTest.tsx.snap @@ -17,16 +17,6 @@ exports[`SideMenuContent matches snapshot for undefined user info, and can imper enableDevelopersOption={true} globalNavConfig={ Array [ - Object { - "action": Object { - "type": "NAVIGATE", - "value": "itemInfo", - }, - "enabled": true, - "icon": "barcode", - "menuType": "SUBMENU", - "title": "menu.itemInfo", - }, Object { "action": Object { "type": "NAVIGATE", @@ -35,7 +25,7 @@ exports[`SideMenuContent matches snapshot for undefined user info, and can imper "enabled": true, "icon": "settings", "menuType": "SUBMENU", - "title": "menu.settings", + "title": "Settings", }, Object { "action": Object { @@ -45,17 +35,7 @@ exports[`SideMenuContent matches snapshot for undefined user info, and can imper "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", + "title": "Give feedback", }, ] } @@ -105,16 +85,6 @@ exports[`SideMenuContent matches snapshot with not user/clockstatus data; sets b enableDevelopersOption={false} globalNavConfig={ Array [ - Object { - "action": Object { - "type": "NAVIGATE", - "value": "itemInfo", - }, - "enabled": true, - "icon": "barcode", - "menuType": "SUBMENU", - "title": "menu.itemInfo", - }, Object { "action": Object { "type": "NAVIGATE", @@ -193,16 +163,6 @@ exports[`SideMenuContent matches snapshot with user/clockstatus data; sets bar s enableDevelopersOption={false} globalNavConfig={ Array [ - Object { - "action": Object { - "type": "NAVIGATE", - "value": "itemInfo", - }, - "enabled": true, - "icon": "barcode", - "menuType": "SUBMENU", - "title": "menu.itemInfo", - }, Object { "action": Object { "type": "NAVIGATE",
snapshots
snapshots
ac92bd87122b7dbafe89252cbaf18be7204d7fc3
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.32.0", + "version": "1.33.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.4", + "@walmart/allspark-foundation-hub": "1.3.5", "@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.32.0", + "@walmart/roster-mini-app": "2.33.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.4": - version: 1.3.4 - resolution: "@walmart/allspark-foundation-hub@npm:1.3.4" +"@walmart/allspark-foundation-hub@npm:1.3.5": + version: 1.3.5 + resolution: "@walmart/allspark-foundation-hub@npm:1.3.5" 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/bf649117336f52b0118eb2de9e6c833a7bd0f33aa27fcf5f540f6584847416fcb75d6ca69309519b0dafc32e70d84cc1911d58400859617314741a9c45eeb974 + checksum: 10c0/8d916b2196e6c1131d183f3e008a9f490a4aba2f827198082b056d6f33f8fc86fd1e1405b2f9f4b452e8e924cd4401d636431cd7ee4a536d911f1cfb196f2b2e 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.4" + "@walmart/allspark-foundation-hub": "npm:1.3.5" "@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.32.0" + "@walmart/roster-mini-app": "npm:2.33.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.32.0": - version: 2.32.0 - resolution: "@walmart/roster-mini-app@npm:2.32.0" +"@walmart/roster-mini-app@npm:2.33.0": + version: 2.33.0 + resolution: "@walmart/roster-mini-app@npm:2.33.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/c8c2eeaebc24d0a9456c8c2b317dc4322766d9924204f2396113cf4455da555198b3ead74de9898e84f27adced7beaa6795fa5afb3640872e4216079f959fade + checksum: 10c0/eef5d61567d1ba4a50a8ef54e38664d47c24f1df73611e1c0a8e89ca619f6c83dcf3ce085550dfe51dd7697d8da118ef4d06b5916bb2b2fd8f58815de622e6ed languageName: node linkType: hard
Update the my team mini app version
Update the my team mini app version
45075bde65cb01bb44a0b121675825ae79781cc7
--- package.json @@ -147,7 +147,7 @@ "@walmart/rn-receiving-mini-app": "2.4.86", "@walmart/roster-mini-app": "2.38.1", "@walmart/schedule-mini-app": "1.13.0", - "@walmart/shelfavailability-mini-app": "1.5.44", + "@walmart/shelfavailability-mini-app": "1.5.45", "@walmart/shop-gnfr-mini-app": "1.0.302", "@walmart/sidekick-mini-app": "4.199.7", "@walmart/store-feature-orders": "1.29.5", --- yarn.lock @@ -8746,7 +8746,7 @@ __metadata: "@walmart/rn-receiving-mini-app": "npm:2.4.86" "@walmart/roster-mini-app": "npm:2.38.1" "@walmart/schedule-mini-app": "npm:1.13.0" - "@walmart/shelfavailability-mini-app": "npm:1.5.44" + "@walmart/shelfavailability-mini-app": "npm:1.5.45" "@walmart/shop-gnfr-mini-app": "npm:1.0.302" "@walmart/sidekick-mini-app": "npm:4.199.7" "@walmart/store-feature-orders": "npm:1.29.5" @@ -9490,9 +9490,9 @@ __metadata: languageName: node linkType: hard -"@walmart/shelfavailability-mini-app@npm:1.5.44": - version: 1.5.44 - resolution: "@walmart/shelfavailability-mini-app@npm:1.5.44::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fshelfavailability-mini-app%2F-%2F%40walmart%2Fshelfavailability-mini-app-1.5.44.tgz" +"@walmart/shelfavailability-mini-app@npm:1.5.45": + version: 1.5.45 + resolution: "@walmart/shelfavailability-mini-app@npm:1.5.45::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fshelfavailability-mini-app%2F-%2F%40walmart%2Fshelfavailability-mini-app-1.5.45.tgz" peerDependencies: "@react-navigation/native": ">=6.0.8" "@shopify/flash-list": ">=1.6.4" @@ -9517,7 +9517,7 @@ __metadata: reduxsauce: ">=1.2.0" reselect: ">=4.1.0" xdate: ">=0.8.2" - checksum: 10c0/3552921fa10851023776a7b19e8cdc6bbe45afbe77ad82acba4602f51314921742345579fb5d55fe2ad9a141e273ac818c301b16f6fd6ba9b3074b084eb59d08 + checksum: 10c0/147e1c5fdb18dfa239a32b9e3de3a6ec6839671e18959d76075c243566ca16fea1976fdf1c6e57ce916961ff843d7fdd6491a59e8926f3caa8a86cb7225eb9f0 languageName: node linkType: hard
fix: SA-1121 - Bugfix - Zoom in/out functionality fix (#4331)
fix: SA-1121 - Bugfix - Zoom in/out functionality fix (#4331) Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com>
2f6911514e7a21bbdbf94038c5846c85c0727e79
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Components/EditSavedTeams/EditSavedTeams.tsx @@ -11,7 +11,7 @@ import { useAllsparkTranslation } from '@walmart/allspark-foundation'; import { FEATURE_ID } from '../../constant'; import { useGetSupplyChainAllTeamsBySite } from '../../Hooks/useGetSupplyChainTeamsByStore'; import { editSavedTeamsEnabled } from '../../Redux'; -import { useGetSupplyChainTeamsPreferenceQuery } from '../../Hooks/upsertSupplyChainAssociatePreferenceMutation'; +import { useGetSupplyChainTeamsPreferenceQuery } from '../../Hooks/useGetSupplyChainTeamPreference'; import { EditSavedTeamsSectionLoading, LoadingListItem,
Adding query updates
Adding query updates
2049f06a8336a6a6d7f8fe96f5a67c5a9795db6e
--- app.config.US.ts @@ -267,7 +267,7 @@ const CONFIG: ExpoConfig = { 'android.permission.FOREGROUND_SERVICE', 'android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK' ], - 'androidForegroundService': true, + 'androidForegroundService': false, 'androidFSTypes': [ 'mediaPlayback' ]
fix(version): disable android foreground for push notification issues (#4677)
fix(version): disable android foreground for push notification issues (#4677) Co-authored-by: Shubhang Shah <s0s0zug@homeoffice.wal-mart.com> Co-authored-by: Maksym Novakh - m0n09mr <Maksym.Novakh0@walmart.com>
671a1200dcb634b03637dc777da03ac372dfd381
--- package-lock.json @@ -80,7 +80,7 @@ "@walmart/schedule-mini-app": "0.37.0", "@walmart/settings-mini-app": "1.18.1", "@walmart/shelfavailability-mini-app": "1.5.16", - "@walmart/taskit-mini-app": "2.40.3", + "@walmart/taskit-mini-app": "2.40.5", "@walmart/time-clock-mini-app": "2.98.0", "@walmart/topstock-mini-app": "1.0.6", "@walmart/ui-components": "1.15.0", @@ -5994,9 +5994,9 @@ } }, "node_modules/@walmart/taskit-mini-app": { - "version": "2.40.3", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.40.3.tgz", - "integrity": "sha512-eXG9NXxRPPbeTKR06/ajP7f4Zvr8G/sANHb1IhVkhQkTY4eQV8ZkBBxnrWyDXZvec2HLNicr29RWdxoWUyy6iQ==", + "version": "2.40.5", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.40.5.tgz", + "integrity": "sha512-Jqab31rzSYArJqSCWFjRdYJe7PZEky/Ngj7WHhQ2Vj3iuXx7Af5Kar41gNKw3bbVIy/V0G11o3m2gBz/ttEPkQ==", "peerDependencies": { "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@types/lodash": ">=4.14.176", @@ -25384,9 +25384,9 @@ "version": "1.5.16" }, "@walmart/taskit-mini-app": { - "version": "2.40.3", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.40.3.tgz", - "integrity": "sha512-eXG9NXxRPPbeTKR06/ajP7f4Zvr8G/sANHb1IhVkhQkTY4eQV8ZkBBxnrWyDXZvec2HLNicr29RWdxoWUyy6iQ==" + "version": "2.40.5", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.40.5.tgz", + "integrity": "sha512-Jqab31rzSYArJqSCWFjRdYJe7PZEky/Ngj7WHhQ2Vj3iuXx7Af5Kar41gNKw3bbVIy/V0G11o3m2gBz/ttEPkQ==" }, "@walmart/tcnumber": { "version": "2.3.3", --- package.json @@ -122,7 +122,7 @@ "@walmart/schedule-mini-app": "0.37.0", "@walmart/settings-mini-app": "1.18.1", "@walmart/shelfavailability-mini-app": "1.5.16", - "@walmart/taskit-mini-app": "2.40.3", + "@walmart/taskit-mini-app": "2.40.5", "@walmart/time-clock-mini-app": "2.98.0", "@walmart/topstock-mini-app": "1.0.6", "@walmart/ui-components": "1.15.0",
updated taskit version
updated taskit version
e53d730c83e03e899eff3ca9b412cc96b934e6ad
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Hooks/useGetSupplyChainTeamPreference.ts @@ -10,9 +10,11 @@ import { ManagerExperienceSelectors, } from '../Redux'; import { useDispatch } from 'react-redux'; +import { useState } from 'react'; export const useGetSupplyChainTeamsPreferenceQuery = () => { const dispatch = useDispatch(); const workingSite: string | undefined = useSelector(UserSelectors.getSiteId); + const [onCompleted, setOnCompleted] = useState(false); const win = useSelector(UserSelectors.getWin); const logger = LoggerService.getContainerInstance(); const teamPreferenceData = (useSelector( @@ -41,6 +43,7 @@ export const useGetSupplyChainTeamsPreferenceQuery = () => { ?.managerExperiencePreferences?.mySupplyChainTeams === null ) { dispatch(ManagerExperienceCreators.setMySupplyChainTeamsData(null)); + setOnCompleted(true); } else { dispatch( ManagerExperienceCreators.setSavedSiteShifts( @@ -56,6 +59,7 @@ export const useGetSupplyChainTeamsPreferenceQuery = () => { ) ) ); + setOnCompleted(true); } }, onError: (err: any) => { @@ -65,5 +69,11 @@ export const useGetSupplyChainTeamsPreferenceQuery = () => { }, }); - return { data, shiftPreferenceData, teamPreferenceData, ...rest }; + return { + data, + shiftPreferenceData, + teamPreferenceData, + onCompleted, + ...rest, + }; }; --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Screens/OnboardingScreen/OnboardingContext.tsx @@ -13,7 +13,6 @@ import { } from '@walmart/allspark-foundation'; import { UserSelectors } from '@walmart/allspark-foundation/User'; import { useSelector } from 'react-redux'; -// import { ONBOARDING_KEY } from '../../constant'; import { useGetSupplyChainTeamsPreferenceQuery } from '../../Hooks'; // import { ManagerExperienceSelectors } from '../../Redux'; @@ -28,10 +27,8 @@ export const SupplyChainOnboardingProvider = ({ children }: any) => { const isTeamLead: boolean = useSelector(UserSelectors.getIsUserTeamLead); const isSalaried: boolean = useSelector(UserSelectors.getIsUserSalaried); const eligibleForOnboarding = isTeamLead || isSalaried || isPeopleLead; - const associateId = useSelector(UserSelectors.getWin); - const storageKey = ONBOARDING_KEY + associateId; - const { data, teamPreferenceData, shiftPreferenceData } = + const { data, teamPreferenceData, shiftPreferenceData, onCompleted } = useGetSupplyChainTeamsPreferenceQuery(); const showOnboardingFlow = useCallback(() => setShowOnboarding(true), []); const hideOnboardingFlow = useCallback(() => setShowOnboarding(false), []); @@ -88,10 +85,10 @@ export const SupplyChainOnboardingProvider = ({ children }: any) => { }); throw error; } - }, []); + }, [onCompleted]); useEffect(() => { - checkOnboarding(); + // checkOnboarding(); if (eligibleForOnboarding) { getMyTeamData() .then((myTeamData) => { @@ -117,7 +114,7 @@ export const SupplyChainOnboardingProvider = ({ children }: any) => { loggerRef.current.error('Error:', error); }); } - }, []); + }, [onCompleted]); const disableOnboarding = useCallback(() => setShowOnboarding(false), []); @@ -128,7 +125,6 @@ export const SupplyChainOnboardingProvider = ({ children }: any) => { showOnboardingFlow, hideOnboardingFlow, disableOnboarding, - storageKey, }} > {children} --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Screens/OnboardingScreen/OnboardingScreen.tsx @@ -11,7 +11,6 @@ import { FEATURE_ID } from '../../constant'; import { LoggerService, useTelemetryService, - AllsparkLocalStorage, } from '@walmart/allspark-foundation'; import { useOnboardingContext } from './OnboardingContext'; import { UserSelectors } from '@walmart/allspark-foundation/User'; @@ -35,7 +34,7 @@ export const OnboardingScreen = () => { const { t } = useAllsparkTranslation(FEATURE_ID); const teamSelectionTelemetry = useTelemetryService(); const logger = LoggerService.getContainerInstance(); - const { disableOnboarding, storageKey } = useOnboardingContext(); + const { disableOnboarding } = useOnboardingContext(); const { allSiteTeamsSections, error: teamsError, @@ -151,7 +150,6 @@ export const OnboardingScreen = () => { } else { dispatch(ManagerExperienceCreators.setSelectedTeamIDs(selectedTeams)); dispatch(ManagerExperienceCreators.setSelectedShifts(selectedShifts)); - await AllsparkLocalStorage.set(ONBOARDING_KEY, 'true'); upsertSupplyChainPreferences({}, selectedShifts, selectedTeams); disableOnboarding(); }
Adding refresh data changes
Adding refresh data changes
a5a21cea16ef214adfe5dfb87f4ababc8acce058
--- ios/AllSpark/Info.plist @@ -21,7 +21,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.18.1</string> + <string>1.18.10</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -44,7 +44,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>921</string> + <string>923</string> <key>FirebaseAutomaticScreenReportingEnabled</key> <false /> <key>LSApplicationQueriesSchemes</key>
bumping up version code in iOS
bumping up version code in iOS
25e0073d9cdcdd872aa007e9617bb0d8d9e482d7
--- packages/allspark-foundation-hub/src/HubFeature/Store/TeamSelection/Component/SearchInput/SearchInput.tsx @@ -1,31 +0,0 @@ -import React from 'react'; -import { TextInput, View } from 'react-native'; -import { TeamSearchInputStyles as styles } from './style'; -import { colors, Icons } from '@walmart/gtp-shared-components/dist'; -import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation'; -import { FEATURE_ID } from '../../../constant'; - -export const TeamSearchInput = () => { - const { t } = useAllsparkTranslation(FEATURE_ID); - return ( - <View style={styles.container}> - <View style={styles.iconLeftWrapper}> - <Icons.SearchIcon - color={colors.gray['100']} - size={'medium'} - testID='search-icon' - /> - </View> - <TextInput - style={styles.inputStyle} - placeholder={t('teamSelection.myArea')} - placeholderTextColor={colors.gray['100']} - onChangeText={() => {}} - testID='search-input' - /> - <View style={styles.iconRight} testID='microphone-icon'> - <Icons.MicrophoneIcon size={'medium'} /> - </View> - </View> - ); -}; --- packages/allspark-foundation-hub/src/HubFeature/Store/TeamSelection/Component/SearchInput/style.ts @@ -1,32 +0,0 @@ -import { colors } from '@walmart/gtp-shared-components/dist'; -import { StyleSheet } from 'react-native'; - -export const TeamSearchInputStyles = StyleSheet.create({ - container: { - flexDirection: 'row', - alignItems: 'center', - borderWidth: 1, - marginLeft: 16, - marginRight: 16, - borderColor: colors.separator['100'], - borderRadius: 30, - }, - iconRight: { - position: 'absolute', - right: 16, - paddingLeft: 16, - }, - iconLeftWrapper: { - marginRight: 8, - paddingLeft: 16, - }, - inputStyle: { - flex: 1, - paddingVertical: 14, - fontFamily: 'Bogle-Regular', - fontSize: 16, - lineHeight: 24, - paddingRight: 60, - color: colors.gray['100'], - }, -}); --- packages/allspark-foundation-hub/src/HubFeature/Store/TeamSelection/Component/TeamSelectionList.tsx @@ -26,7 +26,6 @@ import { import { AllsparkEnvironment } from '@walmart/allspark-foundation/Environment'; import { getVersion } from 'react-native-device-info'; import { RenderTeamSelectionListItems } from './RenderTeamSelectionListItems'; -import { TeamSearchInput } from './SearchInput/SearchInput'; export const TeamSelectionList = ({ userType, @@ -195,7 +194,6 @@ export const TeamSelectionList = ({ handleSelectAll={handleSelectAll} styles={styles} /> - <TeamSearchInput /> </View> ) : null } --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Components/SearchInput/SearchInput.tsx @@ -2,12 +2,8 @@ import React from 'react'; import { TextInput, View } from 'react-native'; import { TeamSearchInputStyles as styles } from './style'; import { colors, Icons } from '@walmart/gtp-shared-components/dist'; -// import { TeamSearchInputProps } from './types'; -// import { ROSTER_I18N_NAMESPACE } from '../../../../src/translations'; -// import { useTranslation } from 'react-i18next'; export const TeamSearchInput = () => { - // const { t } = useTranslation([ROSTER_I18N_NAMESPACE]); return ( <View style={styles.container}> <View style={styles.iconLeftWrapper}> @@ -24,11 +20,9 @@ export const TeamSearchInput = () => { onChangeText={() => {}} testID='search-input' /> - ( <View style={styles.iconRight} testID='microphone-icon'> <Icons.MicrophoneIcon size={'medium'} /> </View> - ) </View> ); };
Removing comments
Removing comments
eee5549838049c68c5c870fbd6e05f280429b1c7
--- packages/allspark-foundation-hub/src/HubFeature/Hub/HubWidget/index.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { View } from 'react-native'; +import { TouchableOpacity, View } from 'react-native'; import { HubWidgetTypes } from './types'; import { HubWidgetStyles } from './styles'; import { @@ -12,6 +12,7 @@ import { } from '@walmart/gtp-shared-components'; import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation'; import { FEATURE_ID } from '../../constant'; +import { AllsparkNavigationClient } from '@walmart/allspark-foundation'; export const HubWidget = ({ iconName, @@ -24,6 +25,8 @@ export const HubWidget = ({ infoText, isActionBtnDisabled, variant, + routeName, + routeParams, ...rest }: HubWidgetTypes) => { const styles = HubWidgetStyles(); @@ -47,13 +50,20 @@ export const HubWidget = ({ <Heading UNSAFE_style={styles.title} size='medium' testID='heading'> {moduleTitle} </Heading> - <Icons.ChevronRightIcon - size='medium' - UNSAFE_style={styles.leftIcon} - accessible - accessibilityRole='link' - accessibilityLabel={`View ${moduleTitle}`} - /> + + <TouchableOpacity + onPress={() => + AllsparkNavigationClient.navigate(routeName, routeParams) + } + > + <Icons.ChevronRightIcon + size='medium' + UNSAFE_style={styles.leftIcon} + accessible + accessibilityRole='link' + accessibilityLabel={`View ${moduleTitle}`} + /> + </TouchableOpacity> </View> {showShortIntro && ( --- packages/allspark-foundation-hub/src/HubFeature/Hub/HubWidget/types.ts @@ -21,6 +21,8 @@ interface HubWidgetBaseTypes { selectedTeamPreference?: string; selectedTeamIds?: string[]; refresh: string | null; + routeName: string; + routeParams?: { [key: string]: any } | undefined; } interface HubWidgetActionalable extends HubWidgetBaseTypes {
chore(ui): add navigation capability to widget component
chore(ui): add navigation capability to widget component
36ba3cab3ee26558925a2ed8f26005a43e19e39c
--- targets/US/package.json @@ -103,7 +103,7 @@ "@walmart/exception-mini-app": "1.8.11", "@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", "@walmart/feedback-all-spark-miniapp": "0.9.71", - "@walmart/financial-wellbeing-feature-app": "1.26.0", + "@walmart/financial-wellbeing-feature-app": "1.29.2", "@walmart/functional-components": "~6.3.28", "@walmart/gta-react-native-calendars": "0.7.0", "@walmart/gtp-shared-components": "2.2.4", --- yarn.lock @@ -6412,9 +6412,9 @@ __metadata: languageName: node linkType: hard -"@walmart/financial-wellbeing-feature-app@npm:1.26.0": - version: 1.26.0 - resolution: "@walmart/financial-wellbeing-feature-app@npm:1.26.0" +"@walmart/financial-wellbeing-feature-app@npm:1.29.2": + version: 1.29.2 + resolution: "@walmart/financial-wellbeing-feature-app@npm:1.29.2" peerDependencies: "@react-navigation/native": ">=6.0.8" "@react-navigation/stack": ">=6.1.1" @@ -6423,7 +6423,7 @@ __metadata: react-native: ">=0.72.10" react-redux: ">=8.0.4" redux: ">=4.2.1" - checksum: 10c0/b5ac04f8ef991554aff5e83b766dd551a137cb1c8b541d21226cf4deee86ced74f7f8848f39c785245fef8505ea1a736cf25276710a1f389aeed2f0fc628b09e + checksum: 10c0/8ad3af6e17f78c91c078ee2ec404b4312699821fb2f93a16928e2d440be7d47685227b76b9a93fa4cbfc5dea356bec79a4e252f9977caa31a5fdb03c91d20f47 languageName: node linkType: hard @@ -7001,9 +7001,6 @@ __metadata: "@walmart/ask-sam-chat-components": "npm:^0.2.7" "@walmart/ask-sam-mini-app": "npm:1.25.1" "@walmart/associate-listening-mini-app": "npm:1.2.7" - "@walmart/attendance-mini-app": "npm:3.95.0" - "@walmart/avp-feature-app": "npm:0.10.12" - "@walmart/avp-shared-library": "npm:0.10.5" "@walmart/attendance-mini-app": "npm:3.96.0" "@walmart/avp-feature-app": "npm:0.10.12" "@walmart/avp-shared-library": "npm:0.10.5" @@ -7021,7 +7018,7 @@ __metadata: "@walmart/exception-mini-app": "npm:1.8.11" "@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" "@walmart/feedback-all-spark-miniapp": "npm:0.9.71" - "@walmart/financial-wellbeing-feature-app": "npm:1.26.0" + "@walmart/financial-wellbeing-feature-app": "npm:1.29.2" "@walmart/functional-components": "npm:~6.3.28" "@walmart/gta-react-native-calendars": "npm:0.7.0" "@walmart/gtp-shared-components": "npm:2.2.4"
bumped fwb
bumped fwb
26674245fb2f4bca615acef3601a96694c1ee633
--- __tests__/components/__snapshots__/StatusChipTest.tsx.snap @@ -1,78 +1,39 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`StatusChip renders correctly for absent associate 1`] = ` -Array [ - <Tag - color="blue" - variant="tertiary" - > - Do not disturb - </Tag>, - <Tag - color="red" - variant="tertiary" - > - Absent - </Tag>, -] +<Tag + color="red" + variant="tertiary" +> + Absent +</Tag> `; exports[`StatusChip renders correctly for associate on meal 1`] = ` -Array [ - <Tag - color="blue" - variant="tertiary" - > - Do not disturb - </Tag>, - <Tag - color="blue" - variant="tertiary" - > - Meal - </Tag>, -] +<Tag + color="blue" + variant="tertiary" +> + Meal +</Tag> `; exports[`StatusChip renders correctly for associate on ppto 1`] = ` -Array [ - <Tag - color="blue" - variant="tertiary" - > - Do not disturb - </Tag>, - <Tag - color="purple" - variant="tertiary" - > - PPTO - </Tag>, -] -`; - -exports[`StatusChip renders correctly for clocked in associate 1`] = ` <Tag - color="blue" + color="purple" variant="tertiary" > - Do not disturb + PPTO </Tag> `; +exports[`StatusChip renders correctly for clocked in associate 1`] = `null`; + exports[`StatusChip renders correctly for tardy associate 1`] = ` -Array [ - <Tag - color="blue" - variant="tertiary" - > - Do not disturb - </Tag>, - <Tag - color="red" - variant="tertiary" - > - Tardy - </Tag>, -] +<Tag + color="red" + variant="tertiary" +> + Tardy +</Tag> `; --- __tests__/components/__snapshots__/StatusChipTest.tsx.snap @@ -1,78 +1,39 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`StatusChip renders correctly for absent associate 1`] = ` -Array [ - <Tag - color="blue" - variant="tertiary" - > - Do not disturb - </Tag>, - <Tag - color="red" - variant="tertiary" - > - Absent - </Tag>, -] +<Tag + color="red" + variant="tertiary" +> + Absent +</Tag> `; exports[`StatusChip renders correctly for associate on meal 1`] = ` -Array [ - <Tag - color="blue" - variant="tertiary" - > - Do not disturb - </Tag>, - <Tag - color="blue" - variant="tertiary" - > - Meal - </Tag>, -] +<Tag + color="blue" + variant="tertiary" +> + Meal +</Tag> `; exports[`StatusChip renders correctly for associate on ppto 1`] = ` -Array [ - <Tag - color="blue" - variant="tertiary" - > - Do not disturb - </Tag>, - <Tag - color="purple" - variant="tertiary" - > - PPTO - </Tag>, -] -`; - -exports[`StatusChip renders correctly for clocked in associate 1`] = ` <Tag - color="blue" + color="purple" variant="tertiary" > - Do not disturb + PPTO </Tag> `; +exports[`StatusChip renders correctly for clocked in associate 1`] = `null`; + exports[`StatusChip renders correctly for tardy associate 1`] = ` -Array [ - <Tag - color="blue" - variant="tertiary" - > - Do not disturb - </Tag>, - <Tag - color="red" - variant="tertiary" - > - Tardy - </Tag>, -] +<Tag + color="red" + variant="tertiary" +> + Tardy +</Tag> `;
fix snapshots
fix snapshots
9181d4386337e1257e852762ec5296433d0968a7
--- package-lock.json @@ -4600,9 +4600,9 @@ } }, "@walmart/core-services-allspark": { - "version": "1.0.0-beta.17", - "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-1.0.0-beta.17.tgz", - "integrity": "sha512-Kf9qQ4kV/Ojwe/c7pLAhtTjlWoSIDozDfenzL3vqeH5FAQyVIdf+xAP7eHu/6EjwZjzx/bkAykyXGTq6PQE4dg==", + "version": "1.0.0-beta.18", + "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-1.0.0-beta.18.tgz", + "integrity": "sha512-VkIQiyS5mefNVpEAv/h14c6DUP5IKSvxjgOM8kdjLag5nEherIc4ZlK9uWL9yiiYYXxoTgPcjoXVsb5aUe5poA==", "requires": { "axios": "^0.26.0", "crypto-js": "^4.1.1", @@ -4831,7 +4831,7 @@ "@walmart/react-native-collapsible": { "version": "1.5.3", "resolved": "https://npme.walmart.com/@walmart/react-native-collapsible/-/react-native-collapsible-1.5.3.tgz", - "integrity": "sha1-XoOvTwTbUqaib/9Ii//qp9yNBQk=", + "integrity": "sha512-A/eHjceqHN2FJVaimSrKO/wIHgP5ymIoiyTMRa10ce8NZ7ejhPelIkCqzwjvQ328HG38y7HPelvu/6xlsiFlUQ==", "requires": { "prop-types": "^15.6.2" } @@ -20107,7 +20107,7 @@ "squiggly-localization": { "version": "0.0.2", "resolved": "https://npme.walmart.com/squiggly-localization/-/squiggly-localization-0.0.2.tgz", - "integrity": "sha1-3ksz5Io53VPnUBiRSVDpxDaSGHU=" + "integrity": "sha512-9j/XUl0XvLk5wksN/nhOcRHmHesVHopX7v3Z1Hv398/656CLarKW0FAqL28zjKO68YH566s8PM1gflrAayBuMA==" }, "sshpk": { "version": "1.16.1", --- package.json @@ -77,7 +77,7 @@ "@walmart/ask-sam-mini-app": "0.41.7", "@walmart/config-components": "3.0.2", "@walmart/core-services": "^1.0.0-beta.7", - "@walmart/core-services-allspark": "^1.0.0-beta.17", + "@walmart/core-services-allspark": "^1.0.0-beta.18", "@walmart/core-utils": "^0.0.2", "@walmart/counts-component-miniapp": "0.0.35", "@walmart/exception-mini-app": "0.41.1",
bump core services allspark for error handling fixes
bump core services allspark for error handling fixes
f1ef4a8d8803fd6b0f44c165cab4ae119dca0f60
--- packages/allspark-foundation/__tests__/FeatureRunner/__snapshots__/navigation.test.tsx.snap @@ -1,7 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`renderHeader matches snapshot 1`] = ` -[ +<SafeAreaView + edges={ + [ + "top", + ] + } +> <View collapsable={false} pointerEvents="box-none" @@ -20,13 +26,12 @@ exports[`renderHeader matches snapshot 1`] = ` collapsable={false} style={ { - "backgroundColor": "#0071dc", + "backgroundColor": "rgb(255, 255, 255)", "borderBottomColor": "rgb(216, 216, 216)", - "elevation": 0, "flex": 1, "shadowColor": "rgb(216, 216, 216)", "shadowOffset": { - "height": 0, + "height": 0.5, "width": 0, }, "shadowOpacity": 0.85, @@ -34,13 +39,13 @@ exports[`renderHeader matches snapshot 1`] = ` } } /> - </View>, + </View> <View collapsable={false} pointerEvents="box-none" style={ { - "height": 56, + "height": 44, "maxHeight": undefined, "minHeight": undefined, "opacity": undefined, @@ -74,7 +79,7 @@ exports[`renderHeader matches snapshot 1`] = ` "alignItems": "flex-start", "justifyContent": "center", "marginStart": 0, - "paddingLeft": 8, + "paddingStart": 8, } } /> @@ -89,23 +94,12 @@ exports[`renderHeader matches snapshot 1`] = ` } } > - <Text - accessibilityRole="header" - aria-level="1" - collapsable={false} - numberOfLines={1} - onLayout={[Function]} - style={ - { - "color": "white", - "fontFamily": "Bogle", - "fontSize": 18, - "fontWeight": "bold", - } - } + <Heading + color="white" + size="medium" > - Test Header - </Text> + TestScreen + </Heading> </View> <View collapsable={false} @@ -117,15 +111,14 @@ exports[`renderHeader matches snapshot 1`] = ` "flexGrow": 1, "justifyContent": "center", "marginEnd": 0, - "paddingEnd": 16, - "paddingStart": 12, + "paddingStart": 8, } } /> </View> - </View>, - <View />, -] + </View> + <View /> +</SafeAreaView> `; exports[`renderHeaderLeft matches snapshot 1`] = `
fix: updated navigation snapshots
fix: updated navigation snapshots
552cbcaaec74898322ef31fe3f64808de324de48
--- package.json @@ -73,6 +73,7 @@ "@react-navigation/elements": "^2.2.6", "@react-navigation/material-top-tabs": "^7.1.1", "@react-navigation/native": "^7.1.14", + "@react-navigation/native-stack": "^7.4.2", "@react-navigation/stack": "^7.4.2", "@reduxjs/toolkit": "^1.9.7", "@sharcoux/slider": "^6.1.1", @@ -168,7 +169,7 @@ "@walmart/time-clock-mini-app-next": "3.0.0", "@walmart/topstock-mini-app": "1.27.1", "@walmart/translator-mini-app": "patch:@walmart/translator-mini-app@npm%3A1.7.17#~/.yarn/patches/@walmart-translator-mini-app-npm-1.7.17-ff0dbf51a0.patch", - "@walmart/ui-components": "1.26.3-423-05e66f8", + "@walmart/ui-components": "1.27.0", "@walmart/walmart-fiscal-week": "^0.3.6", "@walmart/welcomeme-mini-app": "^1.0.14", "@walmart/wfm-ui": "3.0.4", @@ -230,6 +231,7 @@ "react-native-ble-manager": "11.6.1", "react-native-blob-util": "^0.22.2", "react-native-calendars": "^1.1291.0", + "react-native-circular-progress": "^1.4.1", "react-native-device-info": "~10.13.1", "react-native-drawer-layout": "^4.1.8", "react-native-drop-shadow": "1.0.0", --- src/home/translations.ts @@ -27,7 +27,7 @@ export const enUS = { }, tomorrow: { title_anniversary: 'Tomorrow\'s anniversary', - title_anniversary_plural: 'Today\'s anniversaries', + title_anniversary_plural: 'Tomorrow\'s anniversaries', title_birthday: 'Tomorrow\'s birthday', title_birthday_plural: 'Tomorrow\'s birthdays', }, --- yarn.lock @@ -5411,6 +5411,24 @@ __metadata: languageName: node linkType: hard +"@react-navigation/native-stack@npm:^7.4.2": + version: 7.6.2 + resolution: "@react-navigation/native-stack@npm:7.6.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40react-navigation%2Fnative-stack%2F-%2Fnative-stack-7.6.2.tgz" + dependencies: + "@react-navigation/elements": "npm:^2.8.1" + color: "npm:^4.2.3" + sf-symbols-typescript: "npm:^2.1.0" + warn-once: "npm:^0.1.1" + peerDependencies: + "@react-navigation/native": ^7.1.19 + react: ">= 18.2.0" + react-native: "*" + react-native-safe-area-context: ">= 4.0.0" + react-native-screens: ">= 4.0.0" + checksum: 10c0/cc41cf1af7f2999b005c916a84cbaacc78966160f0d2835b91c00dffe0735c3b478e3f9b673526d61bb0fe6e9771720f9bad6c53746d0d5d10aa856ff45ea44e + languageName: node + linkType: hard + "@react-navigation/native@npm:^7.1.14": version: 7.1.18 resolution: "@react-navigation/native@npm:7.1.18::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40react-navigation%2Fnative%2F-%2Fnative-7.1.18.tgz" @@ -8077,6 +8095,7 @@ __metadata: "@react-navigation/elements": "npm:^2.2.6" "@react-navigation/material-top-tabs": "npm:^7.1.1" "@react-navigation/native": "npm:^7.1.14" + "@react-navigation/native-stack": "npm:^7.4.2" "@react-navigation/stack": "npm:^7.4.2" "@redux-saga/testing-utils": "npm:^1.1.5" "@reduxjs/toolkit": "npm:^1.9.7" @@ -8184,7 +8203,7 @@ __metadata: "@walmart/time-clock-mini-app-next": "npm:3.0.0" "@walmart/topstock-mini-app": "npm:1.27.1" "@walmart/translator-mini-app": "patch:@walmart/translator-mini-app@npm%3A1.7.17#~/.yarn/patches/@walmart-translator-mini-app-npm-1.7.17-ff0dbf51a0.patch" - "@walmart/ui-components": "npm:1.26.3-423-05e66f8" + "@walmart/ui-components": "npm:1.27.0" "@walmart/walmart-fiscal-week": "npm:^0.3.6" "@walmart/welcomeme-mini-app": "npm:^1.0.14" "@walmart/wfm-ui": "npm:3.0.4" @@ -8263,6 +8282,7 @@ __metadata: react-native-ble-manager: "npm:11.6.1" react-native-blob-util: "npm:^0.22.2" react-native-calendars: "npm:^1.1291.0" + react-native-circular-progress: "npm:^1.4.1" react-native-device-info: "npm:~10.13.1" react-native-drawer-layout: "npm:^4.1.8" react-native-drop-shadow: "npm:1.0.0" @@ -19600,6 +19620,19 @@ __metadata: languageName: node linkType: hard +"react-native-circular-progress@npm:^1.4.1": + version: 1.4.1 + resolution: "react-native-circular-progress@npm:1.4.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Freact-native-circular-progress%2F-%2Freact-native-circular-progress-1.4.1.tgz" + dependencies: + prop-types: "npm:^15.8.1" + peerDependencies: + react: ">=16.0.0" + react-native: ">=0.50.0" + react-native-svg: ">=7.0.0" + checksum: 10c0/f6aa224eff9a01ca708443204e6b701d01b99138d225a1a083a6daac319a659088667e2a89644b258943e610b4892528c0e8aeb33fc0f250c60dc3842f56142c + languageName: node + linkType: hard + "react-native-device-info@npm:~10.13.1": version: 10.13.2 resolution: "react-native-device-info@npm:10.13.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Freact-native-device-info%2F-%2Freact-native-device-info-10.13.2.tgz" @@ -21318,6 +21351,13 @@ __metadata: languageName: node linkType: hard +"sf-symbols-typescript@npm:^2.1.0": + version: 2.1.0 + resolution: "sf-symbols-typescript@npm:2.1.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fsf-symbols-typescript%2F-%2Fsf-symbols-typescript-2.1.0.tgz" + checksum: 10c0/b6e2482c2b3ba785aa00770013e343a2175475b9cb7c8703c30a2ec1da8b41acd982db2d953877afb35af32a3dfba337d0b29e703c399cd2138c3cf68685c9c2 + languageName: node + linkType: hard + "sharp@npm:^0.34.4": version: 0.34.4 resolution: "sharp@npm:0.34.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fsharp%2F-%2Fsharp-0.34.4.tgz" @@ -23686,7 +23726,7 @@ __metadata: languageName: node linkType: hard -"warn-once@npm:0.1.1, warn-once@npm:^0.1.0": +"warn-once@npm:0.1.1, warn-once@npm:^0.1.0, warn-once@npm:^0.1.1": version: 0.1.1 resolution: "warn-once@npm:0.1.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fwarn-once%2F-%2Fwarn-once-0.1.1.tgz" checksum: 10c0/f531e7b2382124f51e6d8f97b8c865246db8ab6ff4e53257a2d274e0f02b97d7201eb35db481843dc155815e154ad7afb53b01c4d4db15fb5aa073562496aff7
chore: add native-stack, circular-progress, ui-components versions (#4996)
chore: add native-stack, circular-progress, ui-components versions (#4996)
901a14d8aadb2aac716799f9c410f94425abfe86
--- src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen.tsx @@ -1,3 +1,4 @@ +// @ts-nocheck import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; import {translationClient} from '../../common/translation'; import {RefreshControl, View} from 'react-native'; @@ -6,12 +7,12 @@ import { TOTAL_STORE_TEAM_LABEL, ErrorScreen, ManagerExperienceSelectors, - TeamShiftSwitcher, } from '@walmart/allspark-foundation-hub'; import { supplyChainManagerExperienceSlice, ManagerExperienceSelectors as supplyChainSelector, -} from '@walmart/allspark-foundation-hub'; + TeamShiftSwitcher, +} from '@walmart/allspark-foundation-hub/HubFeature/SupplyChain'; import {RosterDetailPageHeader} from '../../components/RosterDetailPageHeader'; import {RosterFiltersAndInfo} from '../../components/RosterFiltersAndInfo'; import {TeamSearchInput} from '../../components/TeamSearchInput'; @@ -37,6 +38,7 @@ import {sortedAssociateList} from '../../utils/associateList'; import {UserSelectors} from '@walmart/allspark-foundation/User'; import { generateTeamShiftRoster, + generateTeamRoster, mapShift, handleViewAssociateSchedule, filterAssociatesByStatusAndSearchInputAndShift, @@ -101,9 +103,8 @@ export const SupplyChainRosterDetailScreen = ({ const countryCode: string | undefined = useSelector( UserSelectors.getCountryCode, ); - const selectedTeamIds = useSelector( - ManagerExperienceSelectors.getSelectedTeamIDs, - ) ?? [TOTAL_STORE_TEAM_ID]; + const selectedTeamIds = + useSelector(ManagerExperienceSelectors.getSelectedTeamIDs) || []; const shift = useSelector(supplyChainSelector.getSavedSiteShifts); const getSavedSiteTeams = useSelector(supplyChainSelector.getSavedSiteTeams); const selectedTeamPreference = @@ -125,12 +126,21 @@ export const SupplyChainRosterDetailScreen = ({ : initialTeamName; const defaultTeamIds = isSalariedOrLead ? selectedTeamIds : [initialTeamId]; const userIsInRoster = useUserIsInRoster(); + const [switcherTeamState, setSwitcherTeamState] = useState<{ + shiftIds: []; + teamLabel: string | null; + teamIds: string[]; + }>({ + shiftIds: [], + teamLabel: defaultTeamLabel, + teamIds: defaultTeamIds, + }); const [teamState, setTeamState] = useState<{ teamData: any; teamLabel: string | null; teamIds: string[]; }>({ - teamData: '', + teamData: [], teamLabel: defaultTeamLabel, teamIds: defaultTeamIds, }); @@ -233,8 +243,8 @@ export const SupplyChainRosterDetailScreen = ({ const currentTeamName = getCurrentTeamName(); const headerAndSubtext = getHeaderAndSubtext(); - const userTeamIds = selectedTeamIds.length - ? selectedTeamIds + const userTeamIds = switcherTeamState.teamIds.length + ? switcherTeamState.teamIds : getSavedSiteTeams; const teamRoster = rosterData ? (generateTeamShiftRoster( @@ -243,7 +253,15 @@ export const SupplyChainRosterDetailScreen = ({ allTeams, ) as Associate[]) : []; - + const teamRosterHourlyView = rosterData + ? generateTeamRoster( + teamState.teamIds, + rosterData, + currentTeam, + selectedTeamIds, + allTeams, + ) + : []; function getShiftNumbers(shifts: any, mapShift: any) { return shifts.map((shiftData: any) => mapShift[shiftData]); } @@ -268,7 +286,10 @@ export const SupplyChainRosterDetailScreen = ({ undefined, ); const [filteredAssociates, setFilteredAssociates] = useState( - sortedAssociateList(teamRoster, teamLeads), + sortedAssociateList( + isSalariedOrLead ? teamRoster : teamRosterHourlyView, + teamLeads, + ), ); const [searchInput, setSearchInput] = useState(''); @@ -291,15 +312,27 @@ export const SupplyChainRosterDetailScreen = ({ let absentCount = 0; let tardyCount = 0; allTeams?.forEach((teamData: Team) => { - if (teamState.teamIds?.includes(teamData?.teamId as string)) { - scheduledCount = - scheduledCount + - (teamData.membership?.filter(associateIsScheduled) - ?.length as number); - clockedInCount = - filteredAssociates?.filter(associateIsClockedIn)?.length; - absentCount = filteredAssociates?.filter(associateIsAbsent)?.length; - tardyCount = filteredAssociates?.filter(associateIsTardy)?.length; + if (isSalariedOrLead) { + if (switcherTeamState.teamIds?.includes(teamData?.teamId)) { + scheduledCount = + scheduledCount + + teamData.membership?.filter(associateIsScheduled)?.length; + clockedInCount = + filteredAssociates?.filter(associateIsClockedIn)?.length; + absentCount = filteredAssociates?.filter(associateIsAbsent)?.length; + tardyCount = filteredAssociates?.filter(associateIsTardy)?.length; + } + } else { + if (teamState.teamIds?.includes(teamData?.teamId as string)) { + scheduledCount = + scheduledCount + + (teamData.membership?.filter(associateIsScheduled) + ?.length as number); + clockedInCount = + filteredAssociates?.filter(associateIsClockedIn)?.length; + absentCount = filteredAssociates?.filter(associateIsAbsent)?.length; + tardyCount = filteredAssociates?.filter(associateIsTardy)?.length; + } } }); return { @@ -456,7 +489,7 @@ export const SupplyChainRosterDetailScreen = ({ // Effect for non-DC sites filtering useEffect(() => { const associatesFiltered = filterAssociatesByStatusAndSearchInputAndShift( - filteredTeamRoster, + isSalariedOrLead ? filteredTeamRoster : teamRosterHourlyView, selectedFilter, searchInput, shiftSelected, @@ -530,9 +563,13 @@ export const SupplyChainRosterDetailScreen = ({ {isSalariedOrLead ? ( <View style={styles.switcherContainer}> <TeamShiftSwitcher - onTeamChange={(teamData: any, teamLabel: any, teamIds: any) => { - setTeamState({ - teamData: teamData, + onTeamChange={( + teamIds: string[], + teamLabel: string | null, + shiftIds: [], + ) => { + setSwitcherTeamState({ + shiftIds: shiftIds, teamLabel: teamLabel, teamIds: teamIds, });
teamSwitcher integration fixes
teamSwitcher integration fixes
64aaa0a0315a68d9686dd3873a7ba281670d21cb
--- packages/me-at-walmart-athena-queries/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. +# [6.29.0](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-athena-queries@6.28.0...@walmart/me-at-walmart-athena-queries@6.29.0) (2025-01-09) + +### Features + +- **ui:** exporting added queries ([8cb46fc](https://gecgithub01.walmart.com/allspark/allspark/commit/8cb46fc33ff24b927329e2a3edfc8796fa0a99bd)) + # [6.28.0](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-athena-queries@6.27.0...@walmart/me-at-walmart-athena-queries@6.28.0) (2025-01-09) ### Features --- packages/me-at-walmart-athena-queries/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart-athena-queries", - "version": "6.28.0", + "version": "6.29.0", "description": "> TODO: description", "author": "rlane1 <russell.lane@walmart.com>", "homepage": "",
chore(version): updating package version
chore(version): updating package version - @walmart/me-at-walmart-athena-queries@6.29.0
80609f81db479cf9b76342e09fd6e9b5b929c75d
--- __tests__/core/notificationInitTest.ts @@ -16,8 +16,10 @@ jest.mock('@walmart/redux-store', () => ({ describe('notificationInit', () => { it('sets sumo auth token, options, and user profile', async () => { - const authToken1 = '12345'; - const authToken2 = '54321'; + const accessToken1 = '12345'; + const accessToken2 = '54321'; + const user1 = 'user1'; + const user2 = 'user2'; let onAction: () => Promise<void> = async () => Promise.resolve(); const mockGetStore = getStore as jest.Mock; const mockSubscribe = jest.fn((fn: () => Promise<void>) => { @@ -35,8 +37,10 @@ describe('notificationInit', () => { mockGetState.mockReturnValueOnce({ user: { - user: null, - authToken: null, + data: null, + }, + auth: { + data: null, }, }); await onAction(); @@ -49,10 +53,15 @@ describe('notificationInit', () => { data: { siteId: 'NOT_FOUND', domain: 'homeoffice', - userId: 'user', + userId: user1, countryCode: 'US', }, - authToken: authToken1, + authToken: accessToken1, + }, + auth: { + data: { + accessToken: accessToken1, + }, }, }); onAction(); @@ -60,30 +69,38 @@ describe('notificationInit', () => { expect(WmNotification.setOptions).not.toHaveBeenCalled(); expect(WmNotification.setProfile).not.toHaveBeenCalled(); + // initial configuration mockGetState.mockReturnValueOnce({ user: { data: { siteId: '100', domain: 'homeoffice', - userId: 'user', + userId: user1, countryCode: 'US', }, - authToken: authToken1, + }, + auth: { + data: { + accessToken: accessToken1, + }, }, }); await onAction(); - expect(WmNotification.setPingFedToken).toHaveBeenCalledWith(authToken1); + expect(WmNotification.setPingFedToken).toHaveBeenCalledWith(accessToken1); + expect(WmNotification.setPingFedToken).toHaveBeenCalledTimes(1); expect(WmNotification.setOptions).toHaveBeenCalled(); expect(WmNotification.setProfile).toHaveBeenCalledWith({ siteNbr: 100, domain: 'homeoffice', - userId: 'user', + userId: user1, countryCode: 'US', }); + expect(WmNotification.setProfile).toHaveBeenCalledTimes(1); expect(WmNotification.setDefaultEventListener).toBeCalledTimes( Object.values(SumoEventTypes).length, ); + // token changed (WmNotification.setPingFedToken as jest.Mock).mockClear(); (WmNotification.setOptions as jest.Mock).mockClear(); (WmNotification.setProfile as jest.Mock).mockClear(); @@ -93,23 +110,49 @@ describe('notificationInit', () => { data: { siteId: '100', domain: 'storePharm', - userId: 'user', + userId: user1, countryCode: 'US', }, - authToken: authToken2, + }, + auth: { + data: { + accessToken: accessToken2, + }, }, }); await onAction(); - expect(WmNotification.setPingFedToken).toHaveBeenCalledWith(authToken2); - expect(WmNotification.setOptions).toHaveBeenCalled(); + expect(WmNotification.setPingFedToken).toHaveBeenCalledWith(accessToken2); + expect(WmNotification.setOptions).not.toHaveBeenCalled(); + expect(WmNotification.setProfile).not.toHaveBeenCalled(); + + // user changed + (WmNotification.setPingFedToken as jest.Mock).mockClear(); + (WmNotification.setOptions as jest.Mock).mockClear(); + (WmNotification.setProfile as jest.Mock).mockClear(); + (WmNotification.setDefaultEventListener as jest.Mock).mockClear(); + mockGetState.mockReturnValueOnce({ + user: { + data: { + siteId: '100', + domain: 'storePharm', + userId: user2, + countryCode: 'US', + }, + }, + auth: { + data: { + accessToken: accessToken2, + }, + }, + }); + await onAction(); + expect(WmNotification.setPingFedToken).not.toHaveBeenCalled(); + expect(WmNotification.setOptions).not.toHaveBeenCalled(); expect(WmNotification.setProfile).toHaveBeenCalledWith({ siteNbr: 100, domain: 'store', - userId: 'user', + userId: user2, countryCode: 'US', }); - expect(WmNotification.setDefaultEventListener).toBeCalledTimes( - Object.values(SumoEventTypes).length, - ); }); }); --- src/core/notificationInit.ts @@ -1,25 +1,35 @@ -import {getStore} from '@walmart/redux-store'; +import {getStore, User} from '@walmart/redux-store'; import WmNotification, {SumoEventTypes} from 'react-native-wm-notification'; import Config from '../../env'; -let currentAuth: string; +let currentToken: string; +let currentUser: string; /* istanbul ignore next */ let defaultEventHandler = () => true; // TODO update to reflect design export const initSumoNotification = () => { getStore().subscribe(async () => { - const {authToken, data} = getStore().getState().user; - const {siteId} = data || {}; - const shouldConfigNotification = - data && - siteId && - siteId !== 'NOT_FOUND' && - authToken && - authToken !== currentAuth; - if (shouldConfigNotification) { - currentAuth = authToken as string; - const {domain, userId, countryCode} = data; - await WmNotification.setPingFedToken(authToken as string); + const { + user: {data: userData}, + auth: {data: authData}, + } = getStore().getState(); + const {siteId} = userData || {}; + const isSiteIdSet = siteId && siteId !== 'NOT_FOUND'; + + // initial config + if ( + userData && + userData.userId && + !currentUser && + authData && + authData.accessToken && + !currentToken && + isSiteIdSet + ) { + const {domain, countryCode, userId} = userData as User; + currentToken = authData.accessToken; + currentUser = userId; + await WmNotification.setPingFedToken(authData.accessToken); await WmNotification.setOptions(Config.sumoOptions); await WmNotification.setProfile({ siteNbr: Number(siteId), @@ -31,6 +41,25 @@ export const initSumoNotification = () => { Object.values(SumoEventTypes).forEach((eventType) => { WmNotification.setDefaultEventListener(eventType, defaultEventHandler); }); + return; + } + + // update access token + if (authData && !!currentToken && authData.accessToken !== currentToken) { + currentToken = authData.accessToken; + await WmNotification.setPingFedToken(authData.accessToken); + } + + // update user + if (userData && !!currentUser && userData.userId !== currentUser) { + const {domain, countryCode, userId} = userData as User; + currentUser = userId; + await WmNotification.setProfile({ + siteNbr: Number(siteId), + domain: domain.toLowerCase() === 'homeoffice' ? domain : 'store', + userId, + countryCode, + }); } }); };
update sumo on changes to users & access token
update sumo on changes to users & access token
fe6ce7eec05c03b897f1b7224304f8d60caa131d
--- packages/allspark-foundation-hub/src/HubFeature/TeamSelection/Hooks/useTeamsByStore.ts @@ -9,7 +9,6 @@ import { Team } from '../types'; import { useTelemetryService } from '@walmart/allspark-foundation/Telemetry'; import { PLATFORM_NAME } from '../../constant'; - export const useTeamsByStore = () => { const logger = LoggerService.getContainerInstance(); const getTeamsByStoreTelemetry = useTelemetryService();
Merghe changes from parent branch
Merghe changes from parent branch
7bbd1522f3d11c64426be3c15c9f128e7cfda286
--- packages/celebration-mini-app-graphql/src/hooks/useCelebrations.ts @@ -85,7 +85,9 @@ export const useCelebrations = (params: UseCelebrationsParams = {}) => { ...contextHeaders, }, errorPolicy: 'all', - notifyOnNetworkStatusChange: true, + notifyOnNetworkStatusChange: false, // Prevent unnecessary re-renders + fetchPolicy: 'cache-and-network', // Return cached data immediately + nextFetchPolicy: 'cache-first', // Use cache first on subsequent fetches }); const standardQueryResult = useGetTeamByIdQuery({ @@ -99,7 +101,9 @@ export const useCelebrations = (params: UseCelebrationsParams = {}) => { ...contextHeaders, }, errorPolicy: 'all', - notifyOnNetworkStatusChange: true, + notifyOnNetworkStatusChange: false, // Prevent unnecessary re-renders + fetchPolicy: 'cache-and-network', // Return cached data immediately + nextFetchPolicy: 'cache-first', // Use cache first on subsequent fetches }); // Select which result to use based on the feature flag --- packages/celebration-mini-app/src/hooks/useCelebrationViewState.ts @@ -17,6 +17,7 @@ interface UseCelebrationViewStateProps { celebrations: CelebrationEvent[]; groupedCelebrations: GroupedCelebrations; selectedCelebrationType: CelebrationType; + hasData?: boolean; // Add to check if we have cached data } interface UseCelebrationViewStateResult { @@ -33,6 +34,7 @@ export const useCelebrationViewState = ({ error, isFeatureEnabled, celebrations, + hasData = false, // Default to false for backwards compatibility }: UseCelebrationViewStateProps): UseCelebrationViewStateResult => { // Determine the current view state const viewState = useMemo((): ViewState => { @@ -40,15 +42,16 @@ export const useCelebrationViewState = ({ return 'disabled'; } - if (isLoading) { + // Only show loading if we don't have cached data + if (isLoading && !hasData) { return 'loading'; } - if (error) { + if (error && !hasData) { return 'error'; } - if (celebrations.length === 0) { + if (celebrations.length === 0 && !isLoading) { return 'empty'; } @@ -58,6 +61,7 @@ export const useCelebrationViewState = ({ error, isFeatureEnabled, celebrations, + hasData, ]); // Determine if tabs should be shown --- packages/celebration-mini-app/src/screens/CelebrationDetailsScreen.tsx @@ -111,6 +111,7 @@ const CelebrationDetailsScreen = CelebrationFeature.createScreen( selectedTab === CELEBRATION_SCREEN_TABS.BIRTHDAYS ? CELEBRATION_TYPE_BIRTHDAY : CELEBRATION_TYPE_ANNIVERSARY, + hasData: celebrations.length > 0, // Check if we have cached data }); // Log telemetry for navigation - deferred to not block render
feat(ui): update performance
feat(ui): update performance
1caecbb6b89cb3b957c369c70f4d53df33067cda
--- .looper.multibranch.yml @@ -56,7 +56,7 @@ envs: - extras;android;m2repository - extras;google;m2repository - TARGET_XCODE: "13" + TARGET_XCODE: "13.4" RCT_NO_LAUNCH_PACKAGER: true PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true EXTRA_PACKAGER_ARGS: '--sourcemap-output /tmp/index.ios.js.map'
update wifi store locater to v1.0.2
update wifi store locater to v1.0.2
b42a79b6cf306d7f1854e13a87ba313553e31af8
--- src/components/Avatar.tsx @@ -48,10 +48,17 @@ type AvatarProps = { viewer?: boolean; isClockedIn: boolean | {}; style?: StyleProp<ViewStyle>; + showPresence: boolean; }; export const Avatar = (props: AvatarProps) => { - const {userId, viewer = false, style, isClockedIn} = props; + const { + userId, + viewer = false, + style, + isClockedIn, + showPresence = true, + } = props; const [initials, setInitials] = useState<string>(); const viewerName: string = useSelector(UserSelectors.getUserName); @@ -88,9 +95,11 @@ export const Avatar = (props: AvatarProps) => { <Body UNSAFE_style={styles.avatarText}>{initials}</Body> )} - <View style={styles.avatarClockedInIndicator}> - <PresenceIndicator isClockedIn={isClockedIn} /> - </View> + {showPresence && ( + <View style={styles.avatarClockedInIndicator}> + <PresenceIndicator isClockedIn={isClockedIn} /> + </View> + )} </View> ); }; --- src/containers/Message/index.tsx @@ -52,7 +52,14 @@ export const Message = ({ styles.messageRow, isMyMessage ? styles.alignEnd : styles.alignStart, ]}> - {!isMyMessage && <Avatar userId={sentFrom} style={styles.avatar} />} + {!isMyMessage && ( + <Avatar + userId={sentFrom} + style={styles.avatar} + showPresence={false} + isClockedIn={false} + /> + )} <View style={[ styles.message, --- src/components/Avatar.tsx @@ -48,10 +48,17 @@ type AvatarProps = { viewer?: boolean; isClockedIn: boolean | {}; style?: StyleProp<ViewStyle>; + showPresence: boolean; }; export const Avatar = (props: AvatarProps) => { - const {userId, viewer = false, style, isClockedIn} = props; + const { + userId, + viewer = false, + style, + isClockedIn, + showPresence = true, + } = props; const [initials, setInitials] = useState<string>(); const viewerName: string = useSelector(UserSelectors.getUserName); @@ -88,9 +95,11 @@ export const Avatar = (props: AvatarProps) => { <Body UNSAFE_style={styles.avatarText}>{initials}</Body> )} - <View style={styles.avatarClockedInIndicator}> - <PresenceIndicator isClockedIn={isClockedIn} /> - </View> + {showPresence && ( + <View style={styles.avatarClockedInIndicator}> + <PresenceIndicator isClockedIn={isClockedIn} /> + </View> + )} </View> ); }; --- src/containers/Message/index.tsx @@ -52,7 +52,14 @@ export const Message = ({ styles.messageRow, isMyMessage ? styles.alignEnd : styles.alignStart, ]}> - {!isMyMessage && <Avatar userId={sentFrom} style={styles.avatar} />} + {!isMyMessage && ( + <Avatar + userId={sentFrom} + style={styles.avatar} + showPresence={false} + isClockedIn={false} + /> + )} <View style={[ styles.message,
lint fixes
lint fixes
ad61187fd2f5de4ec377012b50fdc607657b6cb9
--- __tests__/components/useRosterWidget.test.ts @@ -1,6 +1,6 @@ import {renderHook, act} from '@testing-library/react-hooks'; import {useRosterWidget} from '../../src/components/RosterWidget/useRosterWidget'; -import {translationClient} from '../../src/common'; +import {Associate, translationClient} from '../../src/common'; import { useDailyRoster, useGetTeamsByStore, @@ -12,6 +12,18 @@ import {mockGetDailyRosterQuery} from '../harness/athenaQueries/getDailyRoster'; import {mockGetTeamsByStoreQuery} from '../harness/athenaQueries/getTeamsByStore'; import {mockSupplyChainTeamsByBusinessUnitQuery} from '../harness/athenaQueries/supplyChainTeamsByBusinessUnit'; import {mockGetSupplyChainShiftsQuery} from '../harness/athenaQueries/getSupplyChainShifts'; +import { + associateIsAbsent, + associateIsAbsentWithShiftsForTotal, + associateIsClockedIn, + associateIsClockedInWithShiftsForTotal, + associateIsScheduled, + associateIsScheduledWithShiftsForTotal, + associateIsTardy, + associateIsTardyWithShiftsForTotal, + calculateCount as calculateAssociateCount, + retrieveNumberOrDefault, +} from '../../src/utils'; jest.useFakeTimers(); jest.mock('../../src/hooks'); @@ -377,4 +389,103 @@ describe('useRosterWidget', () => { expect(refetchRoster).toHaveBeenCalled(); expect(refetchTeamData).toHaveBeenCalled(); }); + + it('should calculate site totals using supply chain shifts when total team is selected', () => { + const rosterDataList = mockGetDailyRosterQuery.result.data + .getDailyRoster as Associate[]; + const supplyChainShifts = + mockGetSupplyChainShiftsQuery.result.data.supplyChainShifts; + const selectedShiftOptions = supplyChainShifts.slice(0, 2).map((shift) => ({ + shiftId: Number(shift.number), + shiftName: String(shift.name), + })); + const shiftNames = selectedShiftOptions.map((shift) => shift.shiftName); + + const expectedCounts = { + scheduledCount: calculateAssociateCount( + rosterDataList, + supplyChainShifts, + shiftNames, + associateIsScheduled, + associateIsScheduledWithShiftsForTotal + ), + clockedInCount: calculateAssociateCount( + rosterDataList, + supplyChainShifts, + shiftNames, + associateIsClockedIn, + associateIsClockedInWithShiftsForTotal + ), + absentCount: calculateAssociateCount( + rosterDataList, + supplyChainShifts, + shiftNames, + associateIsAbsent, + associateIsAbsentWithShiftsForTotal + ), + tardyCount: calculateAssociateCount( + rosterDataList, + supplyChainShifts, + shiftNames, + associateIsTardy, + associateIsTardyWithShiftsForTotal + ), + }; + + renderHook(() => + useRosterWidget( + { + selectedTeamIds: ['total'], + refresh: '', + widgetStyle: {}, + selectedShifts: selectedShiftOptions, + }, + true + ) + ); + + expect(mockSetState).toHaveBeenCalledWith(expectedCounts); + }); + + it('should calculate store totals when total team is selected', () => { + const rosterDataList = mockGetDailyRosterQuery.result.data + .getDailyRoster as Associate[]; + + const expectedCounts = { + scheduledCount: retrieveNumberOrDefault( + rosterDataList.filter((associate) => + associateIsScheduled(associate) + ).length + ), + clockedInCount: retrieveNumberOrDefault( + rosterDataList.filter((associate) => + associateIsClockedIn(associate) + ).length + ), + absentCount: retrieveNumberOrDefault( + rosterDataList.filter((associate) => + associateIsAbsent(associate) + ).length + ), + tardyCount: retrieveNumberOrDefault( + rosterDataList.filter((associate) => + associateIsTardy(associate) + ).length + ), + }; + + renderHook(() => + useRosterWidget( + { + selectedTeamIds: ['total'], + refresh: '', + widgetStyle: {}, + selectedShifts: [], + }, + false + ) + ); + + expect(mockSetState).toHaveBeenCalledWith(expectedCounts); + }); });
chore(test): add test coverage
chore(test): add test coverage
d6299fb804f625e7bf54aad2a93265554d68e3bd
--- src/screens/RosterScreen.tsx @@ -1,5 +1,5 @@ /* eslint-disable react-hooks/exhaustive-deps */ -import React, {useCallback, useEffect, useState} from 'react'; +import React, {useCallback, useEffect, useMemo, useState} from 'react'; import {StyleSheet, View} from 'react-native'; import {useSelector} from 'react-redux'; import _, {noop} from 'lodash'; @@ -79,18 +79,22 @@ export interface TeamInfo { export const RosterHeader: React.FC<{teamInfo?: TeamInfo}> = ({teamInfo}) => { const associates = useGetStoreRoster(); - //TODO: Move this computation to setState on mount, externalize this method so it can be unit tested - const associateWINs = associates - .map((associate) => associate?.win?.toString()) - .filter((WIN) => { - if (!teamInfo) { - return true; - } else { - return ( - WIN && teamInfo.membership.map((member) => member.win).includes(WIN) - ); - } - }) as string[]; //TODO: should we force this typecast? + const associateWINs = useMemo( + () => + associates + .map((associate) => associate?.win?.toString()) + .filter((WIN) => { + if (!teamInfo) { + return true; + } else { + return ( + WIN && + teamInfo.membership.map((member) => member.win).includes(WIN) + ); + } + }) as string[], + [], + ); return ( <View style={styles.rosterHeader}> --- src/screens/RosterScreen.tsx @@ -1,5 +1,5 @@ /* eslint-disable react-hooks/exhaustive-deps */ -import React, {useCallback, useEffect, useState} from 'react'; +import React, {useCallback, useEffect, useMemo, useState} from 'react'; import {StyleSheet, View} from 'react-native'; import {useSelector} from 'react-redux'; import _, {noop} from 'lodash'; @@ -79,18 +79,22 @@ export interface TeamInfo { export const RosterHeader: React.FC<{teamInfo?: TeamInfo}> = ({teamInfo}) => { const associates = useGetStoreRoster(); - //TODO: Move this computation to setState on mount, externalize this method so it can be unit tested - const associateWINs = associates - .map((associate) => associate?.win?.toString()) - .filter((WIN) => { - if (!teamInfo) { - return true; - } else { - return ( - WIN && teamInfo.membership.map((member) => member.win).includes(WIN) - ); - } - }) as string[]; //TODO: should we force this typecast? + const associateWINs = useMemo( + () => + associates + .map((associate) => associate?.win?.toString()) + .filter((WIN) => { + if (!teamInfo) { + return true; + } else { + return ( + WIN && + teamInfo.membership.map((member) => member.win).includes(WIN) + ); + } + }) as string[], + [], + ); return ( <View style={styles.rosterHeader}>
adding memoization
adding memoization
771b4692dbadfe59d5d1f957ee1dd35844d738d5
--- package-lock.json @@ -3218,9 +3218,9 @@ } }, "@walmart/welcomeme-mini-app": { - "version": "0.19.0", - "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.19.0.tgz", - "integrity": "sha512-HPGTv6iRuDd0snZWKwXpIc4Wa+af3OjknAsk5icmxli473Xp36qYAgGgLDkoMfOBsoO8egFACxkMvBLM2IPQYg==" + "version": "0.20.0", + "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.20.0.tgz", + "integrity": "sha512-ieii8oFZlq78+Rr4fYVoYrkAgTsRXj7YSPYmFlGo3qziR4U1xZTz7Zj+BuOXKz91Rx5gkgM+AZPnUYE6PDXJJg==" }, "@walmart/wfm-ui": { "version": "0.1.50", --- package.json @@ -83,7 +83,7 @@ "@walmart/settings-mini-app": "1.2.3", "@walmart/time-clock-mini-app": "0.3.1", "@walmart/ui-components": "1.1.14", - "@walmart/welcomeme-mini-app": "0.19.0", + "@walmart/welcomeme-mini-app": "0.20.0", "@walmart/wfm-ui": "^0.1.50", "axios-cache-adapter": "2.7.3", "crypto-js": "^3.3.0",
welcomeMe mini version bump
welcomeMe mini version bump
33e316433e4d4601eaab2064f83a630518aa252a
--- package.json @@ -4,10 +4,10 @@ "private": true, "scripts": { "android": "react-native run-android", - "android:beta": "yarn run env:beta && react-native run-android --mode=betaDebug", - "android:dev": "yarn run env:dev && react-native run-android --mode=devDebug", - "android:prod": "yarn run env:prod && react-native run-android --mode=prodDebug", - "android:teflon": "yarn run env:teflon && react-native run-android --mode=teflonDebug", + "android:beta": "yarn run env:beta && react-native run-android --active-arch-only --mode=betaDebug", + "android:dev": "yarn run env:dev && react-native run-android --active-arch-only --mode=devDebug", + "android:prod": "yarn run env:prod && react-native run-android --active-arch-only --mode=prodDebug", + "android:teflon": "yarn run env:teflon && react-native run-android --active-arch-only --mode=teflonDebug", "androidConfig:beta": "sh scripts/updateAndroidProjectConfig.sh Beta", "androidConfig:dev": "sh scripts/updateAndroidProjectConfig.sh Dev", "androidConfig:prod": "sh scripts/updateAndroidProjectConfig.sh Prod", @@ -421,7 +421,6 @@ "moment": "^2.29.4", "moment-timezone": "~0.5.43", "namecase": "^1.1.2", - "promise.allsettled": "^1.0.6", "react": "18.2.0", "react-hook-form": "^7.51.0", "react-i18next": "^13.3.1",
chore: update android run scripts
chore: update android run scripts
2045bd7b242cadd84337a3153ceca754002269fe
--- ios/admin_build.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +############# +# This is intended to be used locally to test builds prior to going to looper. +# This performs a release build similar to they way looper will run the build. +# To run locally successfully, you will need the signing key for the Walmart team. +# As this is not given out to most people, you probably do not have it. However, +# the build should get to the point where it wants to perform signing and error out +# at that point, so this can still be used by a person without the signing key to +# get a reasonable level of confidence of whether it will succeed when running in looper. +############# + +export RCT_NO_LAUNCH_PACKAGER=true +export XCODE_CONFIG=Release +export PROVISIONING_PROFILE=./BuildSupport/Allspark_MeAtWM_Beta_InHouse_Profile.mobileprovision +export ENTITLEMENTS='./BuildSupport/ExportOptions.plist' +export XC_PROJECT='./AllSpark.xcodeproj' +export XC_WORKSPACE='./AllSpark.xcworkspace' +export XC_SCHEME='AllSpark' +export XC_TARGET='AllSpark' + + +export http_proxy=http://sysproxy.wal-mart.com:8080 +export https_proxy=http://sysproxy.wal-mart.com:8080 +export no_proxy=localhost,*.wal-mart.com,*.walmart.com + +./BuildSupport/build-archive.sh
added admin_build.sh file
added admin_build.sh file
237678cb8b4bf8de43e05eec6795574a363378ad
--- package.json @@ -87,7 +87,7 @@ "@walmart/core-widget-registry": "0.5.7", "@walmart/counts-component-miniapp": "0.0.39", "@walmart/exception-mini-app": "0.42.6", - "@walmart/facilities-management-miniapp": "0.3.13", + "@walmart/facilities-management-miniapp": "0.3.14", "@walmart/feedback-all-spark-miniapp": "0.8.0", "@walmart/financial-wellbeing-feature-app": "1.0.29", "@walmart/functional-components": "2.0.6",
<REC-2744> [Jeevan] Version bump up
<REC-2744> [Jeevan] Version bump up
e06deb2cf562d8c90eccd3bc4b0df81345271783
--- package-lock.json @@ -57,7 +57,7 @@ "@walmart/financial-wellbeing-feature-app": "1.16.3", "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.1.0", - "@walmart/gtp-shared-components": "2.1.5", + "@walmart/gtp-shared-components": "2.1.3", "@walmart/impersonation-mini-app": "1.20.7", "@walmart/ims-print-services-ui": "2.8.0", "@walmart/inbox-mini-app": "0.90.0", @@ -86,7 +86,7 @@ "@walmart/schedule-mini-app": "0.63.0", "@walmart/shelfavailability-mini-app": "1.5.19", "@walmart/store-feature-orders": "1.24.0", - "@walmart/taskit-mini-app": "2.53.2", + "@walmart/taskit-mini-app": "2.53.3", "@walmart/texting-mini-app": "2.1.4", "@walmart/time-clock-mini-app": "2.175.2", "@walmart/topstock-mini-app": "1.4.8", @@ -8940,9 +8940,9 @@ } }, "node_modules/@walmart/gtp-shared-components": { - "version": "2.1.5", - "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-2.1.5.tgz", - "integrity": "sha512-1FTGDUKiy7T3KVMyF/M0z3lxu5CYb9xNBNY/k43f2Li9+9Gb+WGx5HoUvW/gpe52zN5lvrUDeZ5r1As6QWiKhA==", + "version": "2.1.3", + "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-2.1.3.tgz", + "integrity": "sha512-/wB0vaVPXi8WWkpg8dx8avEuPURd2ynZblQ7VrJFx4UlkH46SMEgasCMBZRoWs/UWpjVE4mjuQ9Sz9p/oF87UA==", "license": "Apache-2.0", "dependencies": { "@livingdesign/tokens": "0.63.0", @@ -9763,9 +9763,9 @@ } }, "node_modules/@walmart/taskit-mini-app": { - "version": "2.53.2", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.53.2.tgz", - "integrity": "sha512-pdDJCi08d+IQ3iOkYfiWQiAC94Fzo1MWeMZ3P8rhNqQttTwsznfNex+6Y4oiT0/eFsxbDApGipOVZPXky/QUhg==", + "version": "2.53.3", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.53.3.tgz", + "integrity": "sha512-tWkRBA+HG9nhrFPLY4j9Ly31asE2iA5TpxTzb3aIeGn9+7WjwCGUoYGuVA34SD9tINrvX4GT0xPF+JGVy2TAcQ==", "peerDependencies": { "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@types/lodash": ">=4.14.176", @@ -33160,9 +33160,9 @@ } }, "@walmart/gtp-shared-components": { - "version": "2.1.5", - "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-2.1.5.tgz", - "integrity": "sha512-1FTGDUKiy7T3KVMyF/M0z3lxu5CYb9xNBNY/k43f2Li9+9Gb+WGx5HoUvW/gpe52zN5lvrUDeZ5r1As6QWiKhA==", + "version": "2.1.3", + "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-2.1.3.tgz", + "integrity": "sha512-/wB0vaVPXi8WWkpg8dx8avEuPURd2ynZblQ7VrJFx4UlkH46SMEgasCMBZRoWs/UWpjVE4mjuQ9Sz9p/oF87UA==", "requires": { "@livingdesign/tokens": "0.63.0", "@walmart/gtp-shared-icons": "1.0.7", @@ -33408,9 +33408,9 @@ "integrity": "sha512-6opFXMOFCSdQMSgscCRSoOYwh9BLbm3IQZ1bCjDW7YFLZU+UNwl41u1jCOrygr3UAuUsJFK7Bi7CAqkZQ7Zd2w==" }, "@walmart/taskit-mini-app": { - "version": "2.53.2", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.53.2.tgz", - "integrity": "sha512-pdDJCi08d+IQ3iOkYfiWQiAC94Fzo1MWeMZ3P8rhNqQttTwsznfNex+6Y4oiT0/eFsxbDApGipOVZPXky/QUhg==" + "version": "2.53.3", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.53.3.tgz", + "integrity": "sha512-tWkRBA+HG9nhrFPLY4j9Ly31asE2iA5TpxTzb3aIeGn9+7WjwCGUoYGuVA34SD9tINrvX4GT0xPF+JGVy2TAcQ==" }, "@walmart/tcnumber": { "version": "2.3.3", --- package.json @@ -98,7 +98,7 @@ "@walmart/financial-wellbeing-feature-app": "1.16.3", "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.1.0", - "@walmart/gtp-shared-components": "2.1.5", + "@walmart/gtp-shared-components": "2.1.3", "@walmart/impersonation-mini-app": "1.20.7", "@walmart/ims-print-services-ui": "2.8.0", "@walmart/inbox-mini-app": "0.90.0", @@ -127,7 +127,7 @@ "@walmart/schedule-mini-app": "0.63.0", "@walmart/shelfavailability-mini-app": "1.5.19", "@walmart/store-feature-orders": "1.24.0", - "@walmart/taskit-mini-app": "2.53.2", + "@walmart/taskit-mini-app": "2.53.3", "@walmart/texting-mini-app": "2.1.4", "@walmart/time-clock-mini-app": "2.175.2", "@walmart/topstock-mini-app": "1.4.8",
updated taskit version and downgraded gtp version
updated taskit version and downgraded gtp version
135ef3fc62003aa0168634954d4b4cdaf1016673
--- android/app/build.gradle @@ -160,7 +160,6 @@ android { release { // Caution! In production, you need to generate your own keystore file. // see https://reactnative.dev/docs/signed-apk-android. - signingConfig signingConfigs.debug minifyEnabled enableProguardInReleaseBuilds proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" }
test for release android build
test for release android build
6860b61290299995aeb77469be04ebbe7efa4f3b
--- package.json @@ -148,7 +148,7 @@ "@walmart/react-native-webex-sdk": "0.9.12", "@walmart/receipt-check-miniapp": "1.34.4", "@walmart/redux-store": "~6.3.28", - "@walmart/returns-mini-app": "4.17.8", + "@walmart/returns-mini-app": "4.17.10", "@walmart/rfid-scan-mini-app": "2.14.3", "@walmart/rn-mobile-sdk-pairing": "2.1.8", "@walmart/rn-receiving-mini-app": "2.6.11", --- yarn.lock @@ -8364,7 +8364,7 @@ __metadata: "@walmart/react-native-webex-sdk": "npm:0.9.12" "@walmart/receipt-check-miniapp": "npm:1.34.4" "@walmart/redux-store": "npm:~6.3.28" - "@walmart/returns-mini-app": "npm:4.17.8" + "@walmart/returns-mini-app": "npm:4.17.10" "@walmart/rfid-scan-mini-app": "npm:2.14.3" "@walmart/rn-mobile-sdk-pairing": "npm:2.1.8" "@walmart/rn-receiving-mini-app": "npm:2.6.11" @@ -8962,9 +8962,9 @@ __metadata: languageName: node linkType: hard -"@walmart/returns-mini-app@npm:4.17.8": - version: 4.17.8 - resolution: "@walmart/returns-mini-app@npm:4.17.8::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freturns-mini-app%2F-%2F%40walmart%2Freturns-mini-app-4.17.8.tgz" +"@walmart/returns-mini-app@npm:4.17.10": + version: 4.17.10 + resolution: "@walmart/returns-mini-app@npm:4.17.10::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freturns-mini-app%2F-%2F%40walmart%2Freturns-mini-app-4.17.10.tgz" dependencies: "@walmart/common-utilities-js": "npm:^1.2.10" "@walmart/virtual-zpl-printer-model": "npm:^0.2.11" @@ -8983,7 +8983,7 @@ __metadata: react-native-mask-input: ^1.2.3 react-redux: "*" redux: "*" - checksum: 10c0/c6ab139a18032e4a4e5a1bf87025cb87dc496900f7e4ecf1a38f0a3d204c6c5e5434e95e98a4860080ddf09787f84e9cd56f296afeb6797352e6637fc2f4679a + checksum: 10c0/27920f2a7d395a663ef7ed11d3f22b9eae0bd372bd6afac26821460c5d8e24e3da5f427539ccbf181c5e57c097fd57cd4f1e03e37c1c386147d6f1bb7d973492 languageName: node linkType: hard
chore(ui): returns mini app image migration (#4789)
chore(ui): returns mini app image migration (#4789)
516a2c873d95a1058970b7ec209ff767417d0e09
--- android/app/src/main/java/com/walmart/stores/allspark/beta/MainActivity.kt @@ -15,7 +15,7 @@ import com.walmart.stores.allspark.beta.BuildConfig class MainActivity: ReactActivity() { /** - * TODO: Explain what this does. + * Handles dynamic module loading for compass, connected calling, etc. */ override fun attachBaseContext(newBase: Context) { super.attachBaseContext(newBase);
Update readme for splitcompact
Update readme for splitcompact
76a10224cd211326036ea990510f7f711e305d4a
--- packages/allspark-foundation-hub/__tests__/HubFeature/HubWidget.test.tsx @@ -15,6 +15,8 @@ const defaultProps: HubWidgetTypes = { isActionBtnDisabled: false, variant: 'content-only', infoText: 'Data-based insight with recommended non-urgent suggestion.', + refresh: '', + routeName: '', }; const renderComponent = (props: {}) => @@ -87,7 +89,7 @@ describe('HubWidget', () => { test('Test 7: renders restricted content variant', () => { const { queryByTestId } = renderComponent({ - variant: 'restricted', + restricted: true, }); expect(queryByTestId('restricted-content')).toBeTruthy(); expect(queryByTestId('infoTxt')).toBeNull(); --- packages/allspark-foundation-hub/src/HubFeature/Hub/HubWidget/index.tsx @@ -25,13 +25,14 @@ export const HubWidget = ({ infoText, isActionBtnDisabled, variant, + restricted = false, routeName, routeParams, ...rest }: HubWidgetTypes) => { const styles = HubWidgetStyles(); const IconComponent = Icons[iconName]; - const showShortIntro = shortIntro && variant !== 'restricted'; + const showShortIntro = shortIntro && !restricted; const { t } = useAllsparkTranslation(FEATURE_ID); console.log('Rest props data: ', rest); @@ -78,64 +79,61 @@ export const HubWidget = ({ { /* RESTRICTED CONTENT VARIANT */ - variant === 'restricted' && ( + restricted ? ( <View style={styles.restrictedContainer}> <Alert variant='info' testID='restricted-content'> {t('hubWidget.restrictedContent.message')} </Alert> </View> - ) - } - - {/* CLOCKED OUT VARIANT */} - - {/* CONTENT AVAILABLE VARIANT */} - {(variant === 'content-only' || - variant === 'actionable' || - variant === 'informational') && ( - <> - {/* CONTENT SLOT */} - <View style={styles.contentSlot}>{content}</View> + ) : ( + (variant === 'content-only' || + variant === 'actionable' || + variant === 'informational') && ( + <> + {/* CONTENT SLOT */} + <View style={styles.contentSlot}>{content}</View> - {/* ACTIONABLE VARIANT */} - {variant === 'actionable' && ( - <View style={styles.actionInsight}> - <Body - UNSAFE_style={styles.actionTxt} - size='medium' - testID='actionTxt' - > - {actionText} - </Body> - <Button - variant='secondary' - isFullWidth - disabled={isActionBtnDisabled || false} - onPress={onActionPress || (() => {})} - testID='action-btn' - > - {actionBtnText} - </Button> - </View> - )} + {/* ACTIONABLE VARIANT */} + {variant === 'actionable' && ( + <View style={styles.actionInsight}> + <Body + UNSAFE_style={styles.actionTxt} + size='medium' + testID='actionTxt' + > + {actionText} + </Body> + <Button + variant='secondary' + isFullWidth + disabled={isActionBtnDisabled || false} + onPress={onActionPress || (() => {})} + testID='action-btn' + > + {actionBtnText} + </Button> + </View> + )} - {/* INFORMATIONAL VARIANT */} - {variant === 'informational' && ( - <View style={styles.infoInsight}> - <View style={styles.infoIcon}> - <Icons.InfoCircleIcon size='medium' /> - </View> - <Body - UNSAFE_style={styles.infoTxt} - size='medium' - testID='infoTxt' - > - {infoText} - </Body> - </View> - )} - </> - )} + {/* INFORMATIONAL VARIANT */} + {variant === 'informational' && ( + <View style={styles.infoInsight}> + <View style={styles.infoIcon}> + <Icons.InfoCircleIcon size='medium' /> + </View> + <Body + UNSAFE_style={styles.infoTxt} + size='medium' + testID='infoTxt' + > + {infoText} + </Body> + </View> + )} + </> + ) + ) + } </View> ); }; --- packages/allspark-foundation-hub/src/HubFeature/Hub/HubWidget/types.ts @@ -5,12 +5,8 @@ interface HubWidgetBaseTypes { loading?: boolean; iconName: keyof typeof Icons; moduleTitle: string; - variant: - | 'actionable' - | 'informational' - | 'content-only' - | 'restricted' - | 'clocked-out'; + variant: 'actionable' | 'informational' | 'content-only'; + restricted?: boolean; shortIntro?: string; content?: ReactNode; actionText?: string; @@ -44,17 +40,7 @@ interface HubWidgetContentOnly extends HubWidgetBaseTypes { content: ReactNode; } -interface HubWidgetRestricted extends HubWidgetBaseTypes { - variant: 'restricted'; -} - -interface HubWidgetClockedOut extends HubWidgetBaseTypes { - variant: 'clocked-out'; -} - export type HubWidgetTypes = | HubWidgetActionalable | HubWidgetInformational - | HubWidgetContentOnly - | HubWidgetClockedOut - | HubWidgetRestricted; + | HubWidgetContentOnly;
chore(ui): remove clockedout variant, and modify restricted to prop
chore(ui): remove clockedout variant, and modify restricted to prop
26c32092788d3db0c8cc07c01a524456e3a3c2f3
--- src/screens/ImagePreviewScreen.tsx @@ -18,7 +18,7 @@ const styles = StyleSheet.create({ justifyContent: 'center', }, itemImage: { - height: '100%', + height: '90%', width: '100%', }, closeButton: { --- src/screens/ImagePreviewScreen.tsx @@ -18,7 +18,7 @@ const styles = StyleSheet.create({ justifyContent: 'center', }, itemImage: { - height: '100%', + height: '90%', width: '100%', }, closeButton: {
update image preview navigation
update image preview navigation
9e0dc8568e6e528bc45bccf1e0a1bccc59813261
--- packages/me-at-walmart-common/__tests__/redux/selectorsTest.ts @@ -50,30 +50,35 @@ describe('Selector', () => { describe('getIsCompensable selector', () => { it('should return true if user is compensable', () => { - const result = MeAtWalmartUserSelectors.getIsCompensable.resultFunc('CA', 'COPE', true); + const result = MeAtWalmartUserSelectors.getIsCompensable.resultFunc('CA', 'COPE', true, 'H'); expect(result).toBe(true); }); it('should return true if user is not in a non-BYOD state and on a personal device', () => { - const result = MeAtWalmartUserSelectors.getIsCompensable.resultFunc('VA', 'PERSONAL', true); + const result = MeAtWalmartUserSelectors.getIsCompensable.resultFunc('VA', 'PERSONAL', true, 'H'); expect(result).toBe(true); }); it('should return false if user is not in a COPE device', () => { - const result = MeAtWalmartUserSelectors.getIsCompensable.resultFunc('CA', 'PERSONAL', true); + const result = MeAtWalmartUserSelectors.getIsCompensable.resultFunc('CA', 'PERSONAL', true, 'H'); expect(result).toBe(false); }); it('should return false if user is not clocked in', () => { - const result = MeAtWalmartUserSelectors.getIsCompensable.resultFunc('CA', 'COPE', false); + const result = MeAtWalmartUserSelectors.getIsCompensable.resultFunc('CA', 'COPE', false, 'H'); expect(result).toBe(false); }); it('should return false if user is not clocked in and not in a BYOD state', () => { - const result = MeAtWalmartUserSelectors.getIsCompensable.resultFunc('VA', 'COPE', false); + const result = MeAtWalmartUserSelectors.getIsCompensable.resultFunc('VA', 'COPE', false, 'H'); expect(result).toBe(false); }); + + it('should return true if the user is a salaried user irrespective of the state', () => { + const result = MeAtWalmartUserSelectors.getIsCompensable.resultFunc('CA', 'COPE', false, 'S'); + expect(result).toBe(true); + }); }) }); --- packages/me-at-walmart-common/src/redux/selectors.ts @@ -43,8 +43,12 @@ export const getIsCompensable = createSelector( SiteSelectors.getHomeSiteState, DeviceSelectors.getType, ClockSelectors.getIsClockedIn, + UserSelectors.getEmployeeType, ], - (siteState, deviceType, isClockedIn) => { + (siteState, deviceType, isClockedIn, empType) => { + if (empType === 'S') { + return true; + } if (siteState && nonByodStates.includes(siteState)) { return deviceType === 'COPE' && isClockedIn; }
fixing salaried associates not being copensable in non byod states
fixing salaried associates not being copensable in non byod states
0edf2dfa3966373e262d8ea8fd691e6076a061b6
--- docs/CHANGELOG.md @@ -1,3 +1,10 @@ +# [2.32.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.31.0...v2.32.0) (2025-05-01) + + +### Features + +* **ui:** update wmconnect version ([866287b](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/866287b870936152f02e3b44b237ba712ac673cf)) + # [2.31.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.30.0...v2.31.0) (2025-05-01) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.31.0", + "version": "2.32.0", "main": "dist/index.js", "files": [ "dist/"
chore(release): 2.32.0 [skip ci]
chore(release): 2.32.0 [skip ci] # [2.32.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.31.0...v2.32.0) (2025-05-01) ### Features * **ui:** update wmconnect version ([866287b](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/866287b870936152f02e3b44b237ba712ac673cf))
3b0e91bf6224a6fb869bbe899fac505a90aebc11
--- package-lock.json @@ -3354,9 +3354,9 @@ "integrity": "sha512-jplu8SFzqVj1xWNlxMrPmR3oelBdyNBeQHJOr5YM7p7yqAWBiYO2jt9HyUkZCzRkEhrjjDufk9J5K9OJC1GhKA==" }, "@walmart/iteminfo-mini-app": { - "version": "1.0.16", - "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-1.0.16.tgz", - "integrity": "sha512-5GZY5iiaehj3eGSJ7dUl/40jGmytAn7S66SG01JUyxdoDT3KRnkC28Yk1owi3T+gXZ5/0Hq8a66BEYdNTXCkAA==", + "version": "1.0.17", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-1.0.17.tgz", + "integrity": "sha512-q29a/g7ym27zNvROhL7fTerTq5SFLn0PL3TnEAGHdUVQ+QomEv1jiASBJOksqeDyZrHWFegSLbRUMwHNAKJGcg==", "requires": { "react-native-chart-kit": "6.6.1" } --- package.json @@ -76,7 +76,7 @@ "@walmart/impersonation-mini-app": "1.0.15", "@walmart/ims-print-services-ui": "0.0.19", "@walmart/inbox-mini-app": "0.0.96", - "@walmart/iteminfo-mini-app": "1.0.16", + "@walmart/iteminfo-mini-app": "1.0.17", "@walmart/manager-approvals-miniapp": "0.0.39", "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.5.21",
Fixing header for pixel 4a and lines being cut off
Fixing header for pixel 4a and lines being cut off
ade6ec35c19891483dec9471ba5f392aa3b95322
--- ios/Podfile.lock @@ -707,8 +707,8 @@ PODS: - RNWMSSOLibrary (1.1.0): - AppAuth - React - - SSO (= 1.1.1) - - SSO (1.1.1): + - SSO (= 1.1.4) + - SSO (1.1.4): - AppAuth - Starscream (3.0.6) - Yoga (1.14.0) @@ -773,7 +773,7 @@ DEPENDENCIES: - "RNSketchCanvas (from `../node_modules/@terrylinla/react-native-sketch-canvas`)" - RNSVG (from `../node_modules/react-native-svg`) - RNVectorIcons (from `../node_modules/react-native-vector-icons`) - - RNWMSSOLibrary (from `../node_modules/react-native-ssmp-sso`) + - RNWMSSOLibrary (from `../node_modules/react-native-ssmp-sso-allspark`) - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) SPEC REPOS: @@ -928,7 +928,7 @@ EXTERNAL SOURCES: RNVectorIcons: :path: "../node_modules/react-native-vector-icons" RNWMSSOLibrary: - :path: "../node_modules/react-native-ssmp-sso" + :path: "../node_modules/react-native-ssmp-sso-allspark" Yoga: :path: "../node_modules/react-native/ReactCommon/yoga" @@ -1019,8 +1019,8 @@ SPEC CHECKSUMS: RNSketchCanvas: 6939b18677cd1794151cc3d8eb5a0a2158a4a05b RNSVG: ce9d996113475209013317e48b05c21ee988d42e RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59 - RNWMSSOLibrary: 5fffbfd8752629e46129fa86e3adc2dbcb00df3f - SSO: 65024a539a6f02ca28ce1314ee0f8640c398f8ba + RNWMSSOLibrary: 03b3bb3f7263d227aba4b8e850a53e36b1ca3d9a + SSO: f057bb55a8ba5c6f04215925542d3420ec5a0e09 Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5 Yoga: 7740b94929bbacbddda59bf115b5317e9a161598 --- package-lock.json @@ -1887,9 +1887,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "0.6.4", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.6.4.tgz", - "integrity": "sha512-mA9PXtjpCe6eZRCrDzVi4X7BGYSddprZTUYDYPM9D3mSGVcMpqIcIICoZgS8umptHDsQ30LydDkFLjnMCYiyHw==", + "version": "0.6.6", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.6.6.tgz", + "integrity": "sha512-V4szxf7LoTf8GeL4jfZUVPEOhV3v2fNg+mFNUEqb+Yqqfdh/ZWMAfpQsvOUtmzbm8OeshjAKnb2PZLLGTwnzFA==", "requires": { "@babel/preset-typescript": "^7.10.4", "apisauce": "^1.1.2", @@ -9134,9 +9134,9 @@ } }, "react-native-connect-sso-redux": { - "version": "0.1.3", - "resolved": "https://npme.walmart.com/react-native-connect-sso-redux/-/react-native-connect-sso-redux-0.1.3.tgz", - "integrity": "sha512-jHgmoi8c66WxnNCIW21ehubkPvthFDRU1G9EsD+tfObP4mqFQXqjbO0baK61UzReG2ZJGk7zAviA3J5sD4FDOw==" + "version": "1.0.0-rc1", + "resolved": "https://npme.walmart.com/react-native-connect-sso-redux/-/react-native-connect-sso-redux-1.0.0-rc1.tgz", + "integrity": "sha512-TDu7RZM2dvU/dh4+AdCB4hHScXcC8xLMANRZBeVGEZ1s+MXq5rMSFQ2ur8RonulCf/q0Trf6OgeOHj6YH84b8A==" }, "react-native-device-info": { "version": "5.6.5", @@ -9242,10 +9242,10 @@ "resolved": "https://npme.walmart.com/react-native-sha256/-/react-native-sha256-1.3.6.tgz", "integrity": "sha512-uS77ZQn9Z1l7ZYbZkxDsS8oP8VhO0pXqC3Os0rI7HLYG2PUiThMg/sbjskzsl3KZ2Cfvw9mA7RE86hHxGQ63QA==" }, - "react-native-ssmp-sso": { - "version": "1.0.0", - "resolved": "https://npme.walmart.com/react-native-ssmp-sso/-/react-native-ssmp-sso-1.0.0.tgz", - "integrity": "sha512-LyZeFspZgz76e3jAr9tkqNnA33GR5GUPdl8s9hc1bfJKTd7nnAYkplKbRnpOO3dVKCP2OqcP/3GG8QJhRWXEpw==" + "react-native-ssmp-sso-allspark": { + "version": "0.0.1-rc6", + "resolved": "https://npme.walmart.com/react-native-ssmp-sso-allspark/-/react-native-ssmp-sso-allspark-0.0.1-rc6.tgz", + "integrity": "sha512-KbMbjoNPBNLN4vjIi4qxKHVO7ajgkn80dXY4McHQJwXmTZm9H73vJjHoifgS5ibeG/746NxfFzjPnOFnA1zz0Q==" }, "react-native-step-indicator": { "version": "1.0.3", --- package.json @@ -60,7 +60,7 @@ "react-native": "0.63.2", "react-native-barcode-builder": "^2.0.0", "react-native-circular-progress": "^1.3.6", - "react-native-connect-sso-redux": "^0.1.3", + "react-native-connect-sso-redux": "^1.0.0-rc1", "react-native-device-info": "^5.6.5", "react-native-gesture-handler": "^1.7.0", "react-native-get-random-values": "^1.5.0", @@ -74,7 +74,7 @@ "react-native-safe-area-context": "^3.1.3", "react-native-screens": "^2.10.1", "react-native-sha256": "^1.3.6", - "react-native-ssmp-sso": "^1.0.0", + "react-native-ssmp-sso-allspark": "0.0.1-rc6", "react-native-sumo-sdk": "^2.7.1", "react-native-svg": "^12.1.0", "react-native-tab-view": "^2.15.2",
changing which sso we are using; new one calls kgraph and provides extra data
changing which sso we are using; new one calls kgraph and provides extra data
067977bb4b4886cb80a06baba6ae702eea8e2636
--- core/src/features/attendance.ts @@ -20,7 +20,9 @@ export default AttendanceFeature.createModule({ onConnect: () => { const {TorInboxWidget} = require('@walmart/attendance-mini-app'); InboxContainer.add('torWidget', TorInboxWidget); - const {addLanguageResources} = require('@walmart/attendance-mini-app/dist/localization'); + const { + addLanguageResources, + } = require('@walmart/attendance-mini-app/dist/localization'); addLanguageResources(); }, }, --- package.json @@ -20,8 +20,8 @@ "env:teflon": "yarn workspaces foreach --all -p run env:teflon", "jetifier": "jetifier", "increment:buildNumber": "yarn workspaces foreach --all -p run increment:buildNumber", - "lint": "eslint ./targets/**/src ./packages/**/src ./core/src --ext .js,.jsx,.ts,.tsx --max-warnings 3", - "lint:fix": "eslint ./targets/**/src ./packages/**/src ./core/src --ext .js,.jsx,.ts,.tsx --fix", + "lint": "eslint ./targets/*/src ./packages/**/src ./core/src --ext .js,.jsx,.ts,.tsx --max-warnings 3", + "lint:fix": "eslint ./targets/*/src ./packages/**/src ./core/src --ext .js,.jsx,.ts,.tsx --fix", "pod:install": "yarn workspaces foreach --all -p run pod:install", "solidarity": "solidarity", "test": "jest --no-watchman", --- targets/US/src/features/root/sideKey/SideButtonSagas.ts @@ -73,7 +73,7 @@ export const processKeyEvent = async (keyEvent: {keyCode: number}) => { }; export function* onConfigSuccess() { - // requiring KeyEvent later would not add the listener correctly + // requiring KeyEvent later would not add the listener correctly const settingsConfig = yield select(getSettingsAppConfig); const isEnabled = settingsConfig?.enableSideKey ?? true;
lint path fix
lint path fix
cd294ac9b873e2b25f713e26ca816891dda78dbf
--- package-lock.json @@ -4253,9 +4253,9 @@ "integrity": "sha512-DMXzHrlFBvd5qOHxju7irJ+4UkclgpwJVlEKzPqmL4oQPYXkjCydvbJR0O5FmZtDDyBrKxKtofD2vD4nyBeHPA==" }, "@walmart/inbox-mini-app": { - "version": "0.20.0", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.20.0.tgz", - "integrity": "sha512-dcR9vAdQEtcoaef9gABIvzFVsvPArfOx3bfX4VEIGj0ItJL0xFY5CLDohXQLW71fuUJbY9uthxMWwG6Zvlin2A==" + "version": "0.21.0", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.21.0.tgz", + "integrity": "sha512-YJoeT8wgDgmv1/8+Ex6dKzGKqRhVe3orE2plWw+fZ+wxKFXDlOCI0hhHRKizCLqYb3+ZieaHR+GGtGF7tcQPIg==" }, "@walmart/iteminfo-mini-app": { "version": "2.0.16", --- package.json @@ -83,7 +83,7 @@ "@walmart/gtp-shared-components": "^1.2.0", "@walmart/impersonation-mini-app": "1.0.20", "@walmart/ims-print-services-ui": "0.0.36", - "@walmart/inbox-mini-app": "0.20.0", + "@walmart/inbox-mini-app": "0.21.0", "@walmart/iteminfo-mini-app": "2.0.16", "@walmart/manager-approvals-miniapp": "0.0.58", "@walmart/metrics-mini-app": "0.4.14", --- src/navigation/AssociateHallwayNav/Tabs/HomeStackNav.tsx @@ -11,7 +11,7 @@ import { CelebrationListScreen, } from '@walmart/allspark-home-mini-app'; import {ScheduleMiniApp} from '@walmart/schedule-mini-app'; -import InboxMiniApp, {useBadgesCount} from '@walmart/inbox-mini-app'; +import {useBadgesCount, InboxScreen} from '@walmart/inbox-mini-app'; import { NewTorScreen, TimeClockTabs, @@ -89,7 +89,7 @@ export const HomeStackNav = () => { {inboxHeaderEnabled && ( <HomeStack.Screen name='inbox' - component={InboxMiniApp} + component={InboxScreen} options={{ title: t('navigation.inbox'), }}
Inbox double header fix
Inbox double header fix
8d8620847c57227465161f2f65cd2afcb80c69e5
--- src/auth/ErrorScreen.tsx @@ -114,7 +114,6 @@ export const ErrorScreen = ( const telemetry = useTelemetry<IAllsparkTelemetry>(); const customError = params?.authError?.message; const customErrorCode = params?.authError?.code; - console.log('sva ', customErrorCode, 'message', customError); const [isNetworkError, isTimeMismatchError, isBrowserNotFoundError] = useMemo(() => { const networkError = networkErrors.some((term) =>
Update src/auth/ErrorScreen.tsx
Update src/auth/ErrorScreen.tsx
f458193ed8593e9a127eeef84ac1ddcd4b7909d4
--- packages/redux-store/src/selectors/user.selectors.ts @@ -45,7 +45,7 @@ export const getIsImpersonated = UserSelectors.getImpersonated; * import {UserSelectors} from '@walmart/allspark-foundation/User'; * useSelector(UserSelectors.getImpersonator); */ -export const getOriginalUser = UserSelectors.getImpersonator; +export const getOriginalUser = UserSelectors.getOriginalUser; /** * @deprecated use `UserSelectors` from '@walmart/allspark-foundation/User' instead
fix: original user selector was improperly mapped
fix: original user selector was improperly mapped
68f16a7ac950b49c11809a06a7b0875004c53b00
--- packages/celebration-mini-app/src/components/Widget/HubCelebrationWidget.tsx @@ -152,6 +152,9 @@ const HubCelebrationWidgetCore: React.FC<HubCelebrationWidgetProps> = ({ const lastCelebrationCountRef = React.useRef<number>(-1); useEffect(() => { if (celebrations.length !== lastCelebrationCountRef.current && !celebrationsLoading) { + celebrations.length !== lastCelebrationCountRef.current && + !celebrationsLoading + ) { lastCelebrationCountRef.current = celebrations.length; CelebrationLogger.debug('Celebrations data loaded', { message: 'Celebration data fetched successfully', @@ -165,12 +168,22 @@ const HubCelebrationWidgetCore: React.FC<HubCelebrationWidgetProps> = ({ }, }); } - }, [celebrations.length, celebrationsLoading, effectiveTeamIds, isSiteDC, showBirthdaysInWidget, showAnniversariesInWidget]); + }, [ + celebrations, + celebrationsLoading, + effectiveTeamIds, + isSiteDC, + showBirthdaysInWidget, + showAnniversariesInWidget, + maxCelebrationsInWidget, + ]); // REFRESH HANDLING // Handle refresh trigger from Hub Framework with loading state const [isRefreshLoading, setIsRefreshLoading] = useState(false); - const [lastRefreshValue, setLastRefreshValue] = useState<string | number | null>(null); + const [lastRefreshValue, setLastRefreshValue] = useState< + string | number | null + >(null); // Handle refresh prop changes with loading state - only trigger if refresh value actually changed useEffect(() => { @@ -199,7 +212,13 @@ const HubCelebrationWidgetCore: React.FC<HubCelebrationWidgetProps> = ({ .catch(() => setIsRefreshLoading(false)); }, 1000); } - }, [refresh, lastRefreshValue, refetchCelebrations, effectiveTeamIds, celebrations.length]); + }, [ + refresh, + lastRefreshValue, + refetchCelebrations, + effectiveTeamIds, + celebrations, + ]); // Combined loading state (initial load, refresh, or user-triggered refresh) const combinedLoadingState = @@ -346,13 +365,9 @@ const HubCelebrationWidgetCore: React.FC<HubCelebrationWidgetProps> = ({ return { anniversaries: anniversaries, - birthdays: birthdays + birthdays: birthdays, }; - }, [ - celebrations, - showBirthdaysInWidget, - showAnniversariesInWidget, - ]); + }, [celebrations, showBirthdaysInWidget, showAnniversariesInWidget]); // Calculate total relevant celebrations (only anniversaries and birthdays) const totalCelebrations = anniversaries.length + birthdays.length; @@ -641,7 +656,7 @@ export const HubCelebrationWidget: React.FC< <ActivityAwareWidget refresh={props.refresh} teamData={props.teamData} - name="HubCelebrationWidget" + name='HubCelebrationWidget' > <HubCelebrationWidgetCore refresh={props.refresh}
fix: looper job failure
fix: looper job failure