commit_hash
stringlengths
40
40
input
stringlengths
13
7.99k
output
stringlengths
5
155
full_message
stringlengths
6
8.96k
a9e6b0e9122d81845fd11cfda97c43cab487eaf0
--- package-lock.json @@ -66,9 +66,9 @@ "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "3.7.0", - "@walmart/roster-mini-app": "1.0.17-alpha-5", + "@walmart/roster-mini-app": "1.0.17-alpha-6", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "1.0.16-alpha-6", + "@walmart/wmconnect-mini-app": "1.0.16-alpha-7", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", @@ -11817,9 +11817,9 @@ } }, "node_modules/@walmart/roster-mini-app": { - "version": "1.0.17-alpha-5", - "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.0.17-alpha-5.tgz", - "integrity": "sha512-4I2PYDB9pRqoATJXUQuMpQgRW8UUaqDdagnIKi485IpAlD6lYB1vxuR+0AoBuBCcUArh+mWbinQBS0v2ajoOeA==", + "version": "1.0.17-alpha-6", + "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.0.17-alpha-6.tgz", + "integrity": "sha512-ki2geJQgNQQmdonRnOz21IvpkcBa10NXVzBo2y1I5EYHnJcqobbQFDJj3qWTDgA0rH2ys6tvvpAmLCIYapumOQ==", "dev": true, "hasInstallScript": true }, @@ -11846,9 +11846,9 @@ } }, "node_modules/@walmart/wmconnect-mini-app": { - "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==", + "version": "1.0.16-alpha-7", + "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.16-alpha-7.tgz", + "integrity": "sha512-+3Kjc6mvzbpxdWAT732DF/u2IvgWagV15oL3AjdTTGs7f+FBa/y6xvj/yCExfO3sNdRb2b7wX3AA5pT5BW4bLQ==", "dev": true, "hasInstallScript": true }, @@ -40901,9 +40901,9 @@ } }, "@walmart/roster-mini-app": { - "version": "1.0.17-alpha-5", - "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.0.17-alpha-5.tgz", - "integrity": "sha512-4I2PYDB9pRqoATJXUQuMpQgRW8UUaqDdagnIKi485IpAlD6lYB1vxuR+0AoBuBCcUArh+mWbinQBS0v2ajoOeA==", + "version": "1.0.17-alpha-6", + "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.0.17-alpha-6.tgz", + "integrity": "sha512-ki2geJQgNQQmdonRnOz21IvpkcBa10NXVzBo2y1I5EYHnJcqobbQFDJj3qWTDgA0rH2ys6tvvpAmLCIYapumOQ==", "dev": true }, "@walmart/ui-components": { @@ -40918,9 +40918,9 @@ } }, "@walmart/wmconnect-mini-app": { - "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==", + "version": "1.0.16-alpha-7", + "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.16-alpha-7.tgz", + "integrity": "sha512-+3Kjc6mvzbpxdWAT732DF/u2IvgWagV15oL3AjdTTGs7f+FBa/y6xvj/yCExfO3sNdRb2b7wX3AA5pT5BW4bLQ==", "dev": true }, "@whatwg-node/events": { --- package.json @@ -89,8 +89,8 @@ "@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-6", - "@walmart/roster-mini-app": "1.0.17-alpha-5", + "@walmart/wmconnect-mini-app": "1.0.16-alpha-7", + "@walmart/roster-mini-app": "1.0.17-alpha-6", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0",
Update version
Update version
faf2f731c65c282e48eda8eb443b5b2d7b250d41
--- targets/US/package.json @@ -140,7 +140,7 @@ "@walmart/redux-store": "~6.3.20", "@walmart/returns-mini-app": "4.15.0", "@walmart/rfid-scan-mini-app": "2.4.4", - "@walmart/rn-receiving-mini-app": "2.3.327", + "@walmart/rn-receiving-mini-app": "2.3.211", "@walmart/roster-mini-app": "2.9.0", "@walmart/schedule-mini-app": "0.118.2", "@walmart/shelfavailability-mini-app": "1.5.37", --- yarn.lock @@ -5973,9 +5973,9 @@ __metadata: languageName: node linkType: hard -"@walmart/atlas-rn-ui-components@npm:1.1.11": - version: 1.1.11 - resolution: "@walmart/atlas-rn-ui-components@npm:1.1.11" +"@walmart/atlas-rn-ui-components@npm:1.0.192": + version: 1.0.192 + resolution: "@walmart/atlas-rn-ui-components@npm:1.0.192" peerDependencies: "@livingdesign/tokens": ">=0.63.0" "@react-native-picker/picker": ">=2.4.0" @@ -5997,7 +5997,7 @@ __metadata: bin: installFonts: scripts/installFonts runCodemods: scripts/runCodemods - checksum: 10c0/6ad2d67767f1dbbb324ab3e261d2e4a725d88fdd24cf4386af11efa2904bd930253a9af0495b9c8d1b0e7203cc1cbdea3b1c8f167f0db5c6bfdbbbf30dbe76b1 + checksum: 10c0/aba39be4e9f82add840c12e07d9c26c3ed245aeeea85864d387e2cd53b3d1bf9a7e69ce865c0ba411ec75b5f4e8fe0aad78842847dfaef2f2893832b2d217137 languageName: node linkType: hard @@ -6658,9 +6658,9 @@ __metadata: languageName: node linkType: hard -"@walmart/loadquality-mini-app@npm:1.0.139": - version: 1.0.139 - resolution: "@walmart/loadquality-mini-app@npm:1.0.139" +"@walmart/loadquality-mini-app@npm:1.0.106": + version: 1.0.106 + resolution: "@walmart/loadquality-mini-app@npm:1.0.106" peerDependencies: "@react-navigation/native": ^6.0.0 "@react-navigation/stack": ^6.1.0 @@ -6669,7 +6669,7 @@ __metadata: axios-cache-adapter: ">=2.7.3" react: ^18.2.0 react-native: ~0.70.5 - checksum: 10c0/b8058cbcf9ca239e8ee56c18f41f9465badb3620e3e5acaaaf8a90c9055447bb3cef2d86ec810bbc25209779c96f8d066a0666e0225b4fe79b940f3bd2438661 + checksum: 10c0/5455b83f722f50169658ecde85656b1f0eaf21811c1b755c6f34a13721a1edccd3c29d8c32497c943ac575e65771d895f3d80810f891be5a79471f74bf2aa043 languageName: node linkType: hard @@ -7047,7 +7047,7 @@ __metadata: "@walmart/redux-store": "npm:~6.3.20" "@walmart/returns-mini-app": "npm:4.15.0" "@walmart/rfid-scan-mini-app": "npm:2.4.4" - "@walmart/rn-receiving-mini-app": "npm:2.3.327" + "@walmart/rn-receiving-mini-app": "npm:2.3.211" "@walmart/roster-mini-app": "npm:2.9.0" "@walmart/schedule-mini-app": "npm:0.118.2" "@walmart/shelfavailability-mini-app": "npm:1.5.37" @@ -7749,12 +7749,12 @@ __metadata: languageName: node linkType: hard -"@walmart/rn-receiving-mini-app@npm:2.3.327": - version: 2.3.327 - resolution: "@walmart/rn-receiving-mini-app@npm:2.3.327" +"@walmart/rn-receiving-mini-app@npm:2.3.211": + version: 2.3.211 + resolution: "@walmart/rn-receiving-mini-app@npm:2.3.211" dependencies: - "@walmart/atlas-rn-ui-components": "npm:1.1.11" - "@walmart/loadquality-mini-app": "npm:1.0.139" + "@walmart/atlas-rn-ui-components": "npm:1.0.192" + "@walmart/loadquality-mini-app": "npm:1.0.106" peerDependencies: "@react-native-clipboard/clipboard": ">=1.14.0" "@react-navigation/native": ^6.0.8 @@ -7777,7 +7777,7 @@ __metadata: react-native-svg: ">=14.1.0" react-native-svg-transformer: ">=1.1.0" react-native-vision-camera: ^2.16.8 - checksum: 10c0/135395e7750f720a169885e5ef634846b2a3f20b3872efd389aceec98e1c0641facd46deebff6dc89c76bd432f8aa34f1c5a2f95e17e1904100c7f87330bfaee + checksum: 10c0/ebd2252ae815ac8a57a5076daf5851efb82934847ff95a55b38ecef7e60de508eef034fda0d542b3b2644c70b70056d81ab987576021cb460cfb7122f216fcba languageName: node linkType: hard
removing URA app changes
removing URA app changes
d6f1e4ad5666f3751fa40c521560f86c1a16f3a9
--- .github/pull_request_template.md @@ -7,19 +7,11 @@ PR/Template Process for Allspark-core: [Link](https://confluence.walmart.com/pag ## Links to JIRA tickets: - -## PR Type: -pr_agent:type - ## Please describe the changes, problems and solutions this PR is addressing: -pr_agent:summary ## Please provide comparision diff of changes from mini app github: (Example: [v2.2.0...octocat:v2.3.3](https://github.com/octocat/linguist/compare/v2.2.0...octocat:v2.3.3) , How to do [comparision](https://docs.github.com/en/repositories/releasing-projects-on-github/comparing-releases)) -## Changes walkthrough 📝: -pr_agent:walkthrough - ## App changes ### Feature flags Please list out the feature flags configured in CCM for the features in this PR --- .pr_agent.toml @@ -1,6 +0,0 @@ -[github_app] -pr_commands = [ - "/review", - "/describe --pr_description.use_description_markers=true", - "/improve", -]
chore: reverting pr template
chore: reverting pr template
c3402914a8dcf08e0faad87b28493efa7b358ac0
--- packages/allspark-foundation-hub/__tests__/HubFeature/TeamOnboarding/ErrorScreen.test.tsx @@ -9,7 +9,7 @@ describe('ErrorScreen Component Tests', () => { buttonText: 'Refresh page', handleButtonPress: () => {}, }; - test('renders error screen component', () => { + test.skip('renders error screen component', () => { const { getByText, getByRole } = render(<ErrorScreen {...defaultProps} />); const errorTitle = getByText('Something went wrong'); expect(errorTitle).toBeDefined(); --- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.0.0-alpha.4", + "version": "1.0.0-alpha.5", "description": "", "main": "Core/index.js", "types": "Core/index.d.ts", --- packages/allspark-foundation-hub/src/HubFeature/Onboarding/TeamOnboarding/Component/TeamOnboarding.tsx @@ -58,7 +58,7 @@ export const TeamOnboarding = ({ <Button accessibilityRole='button' accessibilityActions={[ - { name: buttonText, label: `${buttonText} - button` }, + { name: `${buttonText} - button`, label: `${buttonText} - button` }, ]} size='medium' disabled={buttonIsDisabled} --- packages/allspark-foundation-hub/src/HubFeature/Onboarding/TeamSelection/Component/TeamSelectionList.tsx @@ -175,7 +175,6 @@ export const TeamSelectionList = ({ //TODO: Add translations to all constants <View testID='selectionList'> <SectionList - accessible accessibilityLabel='team-selection-list' style={styles.container} sections={sections}
feat(ui): Update tests and package version
feat(ui): Update tests and package version
8f298cdbd5c2d1064456c45737d2c1c651632756
--- ios/Podfile.lock @@ -1018,6 +1018,6 @@ SPEC CHECKSUMS: Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5 Yoga: 7740b94929bbacbddda59bf115b5317e9a161598 -PODFILE CHECKSUM: 39fa82e3493ba06437a569986e4d67f9203f6c41 +PODFILE CHECKSUM: ef49dd681da3d3f045265073929f39d1bde46fda COCOAPODS: 1.9.3
update checksum val
update checksum val
506f7f0983aedeb5e0449d4ae103d5ebf4cbee1d
--- src/hooks/useConfigData.ts @@ -4,10 +4,6 @@ * global configuration state in a performant and type-safe manner using the * CCM pattern with robust fallback support. * - * ⚠️ **NOTE:** All other configuration access patterns have been removed. - * The `useConfig()` hook is the primary and only method for accessing configuration - * and feature flag data. - * * @module useConfigData * @version 2.0.0 * @since 2.0.0 --- src/store/selectors/selectors.ts @@ -662,9 +662,18 @@ export const getHubPerformanceMetrics = createSelector( } ); -export const getAssociateExpHubConfigData = (state: RootState) => { +/** + * Selector for accessing Associate Experience Hub configuration data from the global appConfig. + * This follows the roster-miniapp pattern of using the foundation's centralized appConfig state. + * + * @function getAssociateExpHubConfigData + * @param {any} state - The global Redux state containing foundation's appConfig + * @returns {AssociateExpHubConfigData} The Associate Experience Hub configuration data + */ +export const getAssociateExpHubConfigData = (state: any) => { try { - return state[FEATURE_ID].appConfig?.data?.associateExpHub || {}; + // Access foundation's appConfig.data.associateExpHub (similar to roster's appConfig.data.roster) + return state.appConfig?.data?.associateExpHub || {}; } catch (error) { AssociateExpHubLogger.error('getAssociateExpHubConfigData error', { message: `error in fetching associate exp hub config data: ${error}`, --- src/store/slices/reducer.ts @@ -280,23 +280,9 @@ export const INITIAL_STATE: any = { * APPLICATION CONFIGURATION * ======================================== */ - /** - * Application configuration data including feature flags. - * Controls the availability and behavior of various hub features. - */ - appConfig: { - data: { - associateExpHub: { - features: { - celebrationWidget: true, // Enable celebration widgets by default - rosterWidget: true, // Enable roster display functionality - teamSwitcher: true, // Enable team switching capabilities - editModalUpsert: true, // Enable advanced edit operations - updateModalUpsert: true, // Enable update modal functionality - }, - }, - }, - } as AppConfig, + // Note: appConfig is now managed by @walmart/allspark-foundation/Config + // We access it through state.appConfig.data.associateExpHub + // This aligns with roster-miniapp's pattern of using the foundation's centralized config /* ======================================== * TEAM MANAGEMENT STATE @@ -856,26 +842,8 @@ export const associateExpHubSlice = createSlice({ }; }, - // App Config Management Actions - setAppConfigData: (state, action: PayloadAction<AppConfigData>) => { - state.appConfig.data = action.payload; - }, - - updateAssociateExpHubConfig: ( - state, - action: PayloadAction<Partial<AssociateExpHubConfigData>> - ) => { - if (!state.appConfig.data) { - state.appConfig.data = {}; - } - if (!state.appConfig.data.associateExpHub) { - state.appConfig.data.associateExpHub = {}; - } - state.appConfig.data.associateExpHub = { - ...state.appConfig.data.associateExpHub, - ...action.payload, - }; - }, + // Note: appConfig management removed - now using foundation's centralized config + // Configuration is accessed through state.appConfig.data.associateExpHub }, }); @@ -1003,8 +971,6 @@ export const { // Configuration Actions updateHubConfiguration, - setAppConfigData, - updateAssociateExpHubConfig, // Team Switch Management recordTeamSwitch,
feat(ui): match roster-mini-app #SMDV-8174
feat(ui): match roster-mini-app #SMDV-8174
c0a1c5c5d9874da36e8811cf0706ce3b1791da2b
--- ios/AllSpark.xcodeproj/project.pbxproj @@ -460,7 +460,7 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-AllSpark/Pods-AllSpark-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/react-native-wm-barcode/DMSDK.framework/DMSDK", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/DMSDK/DMSDK.framework/DMSDK", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( --- ios/Podfile.lock @@ -869,7 +869,7 @@ SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 + DoubleConversion: cde416483dac037923206447da6e1454df403714 FBLazyVector: e5569e42a1c79ca00521846c223173a57aca1fe1 FBReactNativeSpec: fe08c1cd7e2e205718d77ad14b34957cce949b58 Firebase: 54cdc8bc9c9b3de54f43dab86e62f5a76b47034f @@ -884,7 +884,7 @@ SPEC CHECKSUMS: FirebasePerformance: b6a1fd3ca81f5d54c4216e43562aa9dcd4f54b19 FirebaseRemoteConfig: 0b813f093033c56fe74a91996044a239ab5acb02 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 5337263514dd6f09803962437687240c5dc39aa4 + glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342 GoogleDataTransport: 85fd18ff3019bb85d3f2c551d04c481dedf71fc9 GoogleUtilities: 3df19e3c24f7bbc291d8b5809aa6b0d41e642437 @@ -979,4 +979,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 0c7cc926823c750eebe424a7c0d463101c78e702 -COCOAPODS: 1.11.2 +COCOAPODS: 1.10.1 \ No newline at end of file
revert pod changes
revert pod changes (cherry picked from commit d114951d62b7f3a828e588bb79f85bcb018731b4)
6bb9fa826cc06fb94edbc2e97e1627c4001fde06
--- package-lock.json @@ -85,7 +85,7 @@ "@walmart/native-rfid-scanner": "3.7.3", "@walmart/onewalmart-miniapp": "1.0.24", "@walmart/pay-stub-miniapp": "0.15.2", - "@walmart/payrollsolution_miniapp": "0.140.3", + "@walmart/payrollsolution_miniapp": "0.140.4", "@walmart/price-changes-mini-app": "1.10.9", "@walmart/profile-feature-app": "1.138.3", "@walmart/react-native-encrypted-storage": "~1.1.3", @@ -12089,9 +12089,9 @@ } }, "node_modules/@walmart/payrollsolution_miniapp": { - "version": "0.140.3", - "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.140.3.tgz", - "integrity": "sha512-LaT2GQbwcRfJDEhkrCWVUp1o6rasFqN9y1BVbn4T9CehLGcQZ1xU1JqbpfGZ/AldoNQw3cgJ6ADNFDyXVMmR0A==", + "version": "0.140.4", + "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.140.4.tgz", + "integrity": "sha512-EFRxFpVHyb53pJvxz5f6LqQcNutD8wo33nCTLS2XViTxg1E1404KvSnnONV5vDhahRLHaa6Nddos1UL4T5TlCQ==", "hasInstallScript": true, "dependencies": { "crypto-js": "^3.3.0", --- package.json @@ -126,7 +126,7 @@ "@walmart/native-rfid-scanner": "3.7.3", "@walmart/onewalmart-miniapp": "1.0.24", "@walmart/pay-stub-miniapp": "0.15.2", - "@walmart/payrollsolution_miniapp": "0.140.3", + "@walmart/payrollsolution_miniapp": "0.140.4", "@walmart/price-changes-mini-app": "1.10.9", "@walmart/profile-feature-app": "1.138.3", "@walmart/react-native-encrypted-storage": "~1.1.3", @@ -389,7 +389,7 @@ "@walmart/native-rfid-scanner": "3.7.3", "@walmart/onewalmart-miniapp": "1.0.24", "@walmart/pay-stub-miniapp": "0.15.2", - "@walmart/payrollsolution_miniapp": "0.140.3", + "@walmart/payrollsolution_miniapp": "0.140.4", "@walmart/price-changes-mini-app": "1.10.9", "@walmart/profile-feature-app": "1.138.3", "@walmart/react-native-encrypted-storage": "~1.1.3",
bump version
bump version
a318c9cf504eca8df78bf3c0458453434f4ecfaa
--- package.json @@ -159,7 +159,7 @@ "@walmart/walmart-fiscal-week": "^0.3.6", "@walmart/welcomeme-mini-app": "1.0.11", "@walmart/wfm-ui": "2.4.0", - "@walmart/wm-plus-mini-app": "1.5.1", + "@walmart/wm-plus-mini-app": "1.5.2", "@walmart/wmconnect-mini-app": "2.24.0", "axios": "~1.6.0", "axios-cache-adapter": "patch:axios-cache-adapter@npm%3A2.7.3#~/.yarn/patches/axios-cache-adapter-npm-2.7.3-26c357b785.patch", --- yarn.lock @@ -7379,7 +7379,7 @@ __metadata: "@walmart/walmart-fiscal-week": "npm:^0.3.6" "@walmart/welcomeme-mini-app": "npm:1.0.11" "@walmart/wfm-ui": "npm:2.4.0" - "@walmart/wm-plus-mini-app": "npm:1.5.1" + "@walmart/wm-plus-mini-app": "npm:1.5.2" "@walmart/wmconnect-mini-app": "npm:2.24.0" adaptive-expressions: "npm:^4.13.5" adaptivecards-templating: "npm:^2.1.0" @@ -8639,16 +8639,16 @@ __metadata: languageName: node linkType: hard -"@walmart/wm-plus-mini-app@npm:1.5.1": - version: 1.5.1 - resolution: "@walmart/wm-plus-mini-app@npm:1.5.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwm-plus-mini-app%2F-%2F%40walmart%2Fwm-plus-mini-app-1.5.1.tgz" +"@walmart/wm-plus-mini-app@npm:1.5.2": + version: 1.5.2 + resolution: "@walmart/wm-plus-mini-app@npm:1.5.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwm-plus-mini-app%2F-%2F%40walmart%2Fwm-plus-mini-app-1.5.2.tgz" peerDependencies: "@walmart/allspark-foundation": ">=6.0.0" expo: 50.0.17 expo-image: 1.5.2 react: "*" react-native: "*" - checksum: 10c0/f21d8dc53a38ab27e17aee2dcef19dc429336addfde7e688c77b35e9784150524dbab6fdf87ac565ea1fcd31a058abbcccf98b117c9f93739144eef801f17bd2 + checksum: 10c0/00036da8815a1f7a82282e1f74e2ac52184cc850fa7b6e07cde8c997c4bb10e221eb151afe06fbb1e861f063900c9e8bef06b7197558fd8c4494bcb36ea48cbc languageName: node linkType: hard
feat(profile): CEWMPLUS-115039 update wmplus miniapp to 1.5.2 (#4122)
feat(profile): CEWMPLUS-115039 update wmplus miniapp to 1.5.2 (#4122)
39d95da5fb5daa2cf89d972f5a7e9d1c64a8a102
--- package-lock.json @@ -5094,14 +5094,13 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "1.2.85", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.2.85.tgz", - "integrity": "sha512-waNUctK6t2w5O+psUgLLhvxrpeJONEeG6tpLbWzXeIqb8tK0dP/6VsyjWIzQWqIMYSRED7BOMiVkYE6bzImaGA==", + "version": "1.2.96", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.2.96.tgz", + "integrity": "sha512-Sy3/JfbgkqWq6BBfAcXZtyfxMca7nbpliBqAM/aFbs8p4hCnAVl6rnQQ66ujEG/XV97hmVNYVenffH8LB0gARQ==", "requires": { "@walmart/core-utils": "^1.0.9", "@walmart/react-native-scanner-3.0": "^0.1.12", "apisauce": "^1.1.2", - "axios": "^0.26.1", "axios-cache-adapter": "^2.7.3", "lodash": "^4.17.19", "moment": "2.26.0", --- package.json @@ -79,7 +79,7 @@ "@walmart/allspark-neon-core": "0.1.31", "@walmart/amp-mini-app": "0.2.13", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.2.85", + "@walmart/ask-sam-mini-app": "1.2.96", "@walmart/config-components": "3.0.3", "@walmart/core-services": "~1.2.11", "@walmart/core-services-allspark": "~1.7.26",
Ask Sam Mini app version update
Ask Sam Mini app version update
8ed966e287b5a33f0a2e921765bee80019966fb8
--- packages/allspark-utils/src/registries/Registry.ts @@ -30,13 +30,13 @@ export class Registry<T extends RecordTypeMap = RecordTypeMap> extends Map< */ private _register<Key extends keyof T>(key: Key, value: T[Key]) { if (this.has(key)) { - throw new Error( + console.warn( `${key.toString()} key already exists on ${this._id} registry` ); } if (this._limit && this.size >= this._limit) { - throw new Error( + console.warn( `${ this._id } registry has met limit, ${key.toString()} was not registered` --- packages/core-services-allspark/src/user/sagas.ts @@ -11,6 +11,7 @@ import { import { IUserContext } from '@walmart/core-services/User'; import { IHttpClient } from '@walmart/allspark-http-client'; import { GraphQLClient } from '@walmart/allspark-graphql-client'; +import { getGraphQLClient } from '@walmart/allspark-graphql-client/lib/apollo/global'; import { IAllsparkLogger } from '../logger'; import { IAllsparkEnvConfig, IAllsparkUser } from '../types'; import { createRestartableSagas } from '../utils'; @@ -39,6 +40,8 @@ export function* onSignInSuccess(this: UserSagaScope, action: SignInSuccess) { export function* onSignOutSuccess(this: UserSagaScope) { // !authState.data && userState.data this.user.clear(); + //Clear apollo cache + getGraphQLClient().clearStore(); } // When the user is updated through redux, we'll persist that change in the cache as well
chore(user): re-register fix and clear apollo cache
chore(user): re-register fix and clear apollo cache
673423b79660569bd62ec5e8c30d143430bceb33
--- android/app/build.gradle @@ -96,8 +96,8 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 926 - versionName "1.19.0" + versionCode 927 + versionName "1.20.0" } signingConfigs { --- ios/AllSpark/Info.plist @@ -21,7 +21,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.19.0</string> + <string>1.20.0</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -44,7 +44,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>926</string> + <string>927</string> <key>FirebaseAutomaticScreenReportingEnabled</key> <false/> <key>LSApplicationQueriesSchemes</key> --- package.json @@ -1,6 +1,6 @@ { "name": "allspark-main", - "version": "1.19.0", + "version": "1.20.0", "private": true, "scripts": { "android": "react-native run-android",
chore: bump version for drop 20
chore: bump version for drop 20
99d07c5400a4e39dac0d38681ad999b1b05a1181
--- __tests__/components/TeamList.test.tsx @@ -19,7 +19,6 @@ jest.mock('@react-navigation/native', () => ({ })); describe('TeamItem', () => { - // beforeEach(() => jest.resetAllMocks()); it('should render TeamItem component with passed in required props', () => { const mockTeamProps: TeamItemProps = { absentCount: 1, @@ -96,8 +95,6 @@ describe('TeamItem', () => { }); it('should render ViewTeam', async () => { - // const navSpy = jest.fn(); - // (useNavigation().navigate as jest.Mock).mockImplementation(() => navSpy()); const mockTeamProps: TeamItemProps = { absentCount: 1, clockedInCount: 2,
removed comments
removed comments
8502d9bc68aa187b6c8b1de9976b3c2cf6d01c05
--- packages/allspark-http-client/src/HttpClient.ts @@ -25,7 +25,12 @@ class HttpClient extends Axios implements IHttpClient { }); // Default key config fields and set on instance - const { timeout = TIMEOUT, interceptors = [] } = config; + const { + timeout = TIMEOUT, + interceptors = [], + requestInterceptors = [], + responseInterceptors = [], + } = config; this.config = { ...config, timeout, interceptors }; this.defaults.timeout = timeout; @@ -36,6 +41,12 @@ class HttpClient extends Axios implements IHttpClient { // Add config interceptors interceptors.forEach(this.useInterceptor.bind(this)); + requestInterceptors.forEach((interceptor) => + this.useInterceptor({ request: interceptor }) + ); + responseInterceptors.forEach((interceptor) => + this.useInterceptor({ response: interceptor }) + ); // @todo - find way to migrate to base axios calls this.post = this.createLegacyHandler('post'); --- packages/allspark-http-client/src/types.ts @@ -68,6 +68,8 @@ export interface HttpClientError<T = any, D = any> extends AxiosError<T, D> { export interface HttpClientConfig extends RawAxiosRequestConfig, RetryConfig { refreshTokenCallback?: RequestInterceptor['fulfilled']; interceptors?: Interceptor[]; + requestInterceptors?: RequestInterceptor[]; + responseInterceptors?: ResponseInterceptor[]; } export interface LegacyAxios extends Omit<Axios, 'put' | 'post' | 'patch'> {
fix: add handling for legacy respone and request interceptors on http client init
fix: add handling for legacy respone and request interceptors on http client init
703699fe24a5a5d32961c831679e8e336fc66376
--- packages/core-services-allspark/package.json @@ -19,6 +19,7 @@ "license": "ISC", "peerDependencies": { "@walmart/allspark-foundation": "*", + "@walmart/me-at-walmart-common": "*", "@walmart/me-at-walmart-container": "*" } } --- packages/core-services-allspark/src/user/types.ts @@ -1 +1 @@ -export type { BU_TYPE_DOMAIN } from '@walmart/me-at-walmart-container'; +export type { BU_TYPE_DOMAIN } from '@walmart/me-at-walmart-common'; --- packages/me-at-walmart-common/package.json @@ -19,6 +19,8 @@ "clean": "rm -rf lib/ || true" }, "peerDependencies": { - "@walmart/allspark-foundation": "*" + "@reduxjs/toolkit": "*", + "@walmart/allspark-foundation": "*", + "redux-saga": "*" } }
fix: update export to use me at common
fix: update export to use me at common
21183c9ffa8620f635c7031de758b475818b5094
--- package-lock.json @@ -13184,9 +13184,9 @@ "integrity": "sha512-s3S3bciDoyVqUyfzVKsXJp+aQxPriU62yL+cvbBJB6d7sGnCFHDQHF7/2y8YfK4Qc756VQ2o3SgCzlcQEYoTEw==" }, "react-native-wm-network": { - "version": "0.1.0", - "resolved": "https://npme.walmart.com/react-native-wm-network/-/react-native-wm-network-0.1.0.tgz", - "integrity": "sha512-lDgyoghNlFRRCK0ET3vYy+HzYK0sENPxs77RkHbkr1VxY2vMlC8MbyU5Hg13ORnDf7qst5A0bVz2bocVHR2k8Q==" + "version": "0.2.0", + "resolved": "https://npme.walmart.com/react-native-wm-network/-/react-native-wm-network-0.2.0.tgz", + "integrity": "sha512-VzqfzB+VeetWbfeGqsP2nbnKyaHAUx9KfWE+YZEtOMQA5L2OSPTSCLz61D0YCiqn7HZeEpFfnMTBhsbYPA0Hkw==" }, "react-native-wm-notification": { "version": "2.0.0", --- package.json @@ -156,7 +156,7 @@ "react-native-webview": "^10.7.0", "react-native-wm-barcode": "2.32.0", "react-native-wm-config": "^0.1.1", - "react-native-wm-network": "^0.1.0", + "react-native-wm-network": "^0.2.0", "react-native-wm-notification": "2.0.0", "react-native-wm-telemetry": "^0.3.0", "react-native-wm-voice-text": "^0.5.0",
Incrementing wm network version
Incrementing wm network version
250dc146e226fbe4c3ffb601bb0dd1b6fab04516
--- package-lock.json @@ -4258,9 +4258,9 @@ "integrity": "sha512-C3HNm372mNtvwuHcDL+4nK75Idsk54+1s0CdPJDKewzBbxFkQMNIuoN3Kk3y46cMkf8bkXidf7oV9gJVArsKwQ==" }, "@walmart/inbox-mini-app": { - "version": "0.32.0", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.32.0.tgz", - "integrity": "sha512-Foj0rGP95pDxa9u357M/2ja2uCGVtZpvKMxI9Dsdw137wCLoJwZ521YYkPhS+gHkuj5jQYWc8NIb259ZAYx5JQ==" + "version": "0.33.0", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.33.0.tgz", + "integrity": "sha512-3EZg12hAGhSB9dlFizagfVTITjRo6Z+GphKpjP2RHlYoP3Ado1v/JSnvk0v2yI+75dll43BunIaTiuoB5G0s0A==" }, "@walmart/iteminfo-mini-app": { "version": "4.0.27", --- package.json @@ -84,7 +84,7 @@ "@walmart/gtp-shared-components": "1.2.0", "@walmart/impersonation-mini-app": "1.0.27", "@walmart/ims-print-services-ui": "0.1.19", - "@walmart/inbox-mini-app": "0.32.0", + "@walmart/inbox-mini-app": "0.33.0", "@walmart/iteminfo-mini-app": "4.0.27", "@walmart/manager-approvals-miniapp": "0.0.59", "@walmart/metrics-mini-app": "0.7.57",
version bump
version bump
6f5a50caad7b5cc0116933108d24988878dc933b
--- src/channels/components/ChannelRow.tsx @@ -7,7 +7,7 @@ import { ViewStyle, } from 'react-native'; import {NavigationProp, useNavigation} from '@react-navigation/native'; - +import moment from 'moment-timezone'; import { Body, Caption, @@ -97,7 +97,18 @@ export const ChannelRow = (props: ChannelRowProps) => { ); const firstRecipientClockedIn = associateIsClockedIn(firstRecipientAssociate); - + const lastMessageTimeStamp = moment(lastMessage?.createdAt?.toDate()); + const currentDate = moment(); + let timeStamp; + if (lastMessageTimeStamp.isSame(currentDate, 'day')) { + timeStamp = lastMessageTimeStamp.format('hh:mm a'); + } else if ( + lastMessageTimeStamp.isSame(currentDate.clone().subtract(1, 'days'), 'day') + ) { + timeStamp = 'Yesterday'; + } else { + timeStamp = lastMessageTimeStamp.format('dddd'); + } const onChannelPress = () => { navigation.navigate(ROOT_CONTAINER_SCREEN_NAME, { // @ts-ignore @@ -145,7 +156,7 @@ export const ChannelRow = (props: ChannelRowProps) => { )} </View> } - trailing={<Caption>{lastMessage?.timestamp}</Caption>}> + trailing={<Caption>{timeStamp}</Caption>}> <Body weight={unread ? '700' : '400'} numberOfLines={1}> {lastMessage?.message} </Body> --- src/channels/components/ChannelRow.tsx @@ -7,7 +7,7 @@ import { ViewStyle, } from 'react-native'; import {NavigationProp, useNavigation} from '@react-navigation/native'; - +import moment from 'moment-timezone'; import { Body, Caption, @@ -97,7 +97,18 @@ export const ChannelRow = (props: ChannelRowProps) => { ); const firstRecipientClockedIn = associateIsClockedIn(firstRecipientAssociate); - + const lastMessageTimeStamp = moment(lastMessage?.createdAt?.toDate()); + const currentDate = moment(); + let timeStamp; + if (lastMessageTimeStamp.isSame(currentDate, 'day')) { + timeStamp = lastMessageTimeStamp.format('hh:mm a'); + } else if ( + lastMessageTimeStamp.isSame(currentDate.clone().subtract(1, 'days'), 'day') + ) { + timeStamp = 'Yesterday'; + } else { + timeStamp = lastMessageTimeStamp.format('dddd'); + } const onChannelPress = () => { navigation.navigate(ROOT_CONTAINER_SCREEN_NAME, { // @ts-ignore @@ -145,7 +156,7 @@ export const ChannelRow = (props: ChannelRowProps) => { )} </View> } - trailing={<Caption>{lastMessage?.timestamp}</Caption>}> + trailing={<Caption>{timeStamp}</Caption>}> <Body weight={unread ? '700' : '400'} numberOfLines={1}> {lastMessage?.message} </Body>
Added timestamp changes for channel screen
Added timestamp changes for channel screen
d87cb77cab7c6c25800ba3d99e411f4e115a5892
--- __tests__/startup/AssociateStartupTest.ts @@ -6,6 +6,7 @@ import {addSagas} from '@walmart/redux-store'; import {useHttpClient} from '@walmart/core-services/HttpClient'; import {useRbacConfig} from '@walmart/config-components'; import {registerAskSamWidgets} from '@walmart/metrics-mini-app'; +import {registerAskSamWidgetsForNotes} from '@walmart/taskit-mini-app'; import {useAssociateStartup} from '../../src/startup/AssociateStartup'; import {StartupActionCreators} from '../../src/startup/StartupRedux'; @@ -28,6 +29,10 @@ jest.mock('../../src/survey/SurveySaga', () => ({ surveySagas: jest.fn(), })); +jest.mock('@walmart/taskit-mini-app', () => ({ + registerAskSamWidgetsForNotes: jest.fn(), +})); + const mockCancelNavConfig = jest.fn(); jest.mock('../../src/navConfig', () => ({ initNavConfig: jest.fn(() => mockCancelNavConfig), @@ -48,7 +53,7 @@ describe('useAssociateStartup', () => { const {unmount} = renderHook(() => useAssociateStartup()); expect(registerAskSamWidgets).toHaveBeenCalled(); - + expect(registerAskSamWidgetsForNotes).toHaveBeenCalled(); expect(useRbacConfig).toHaveBeenCalledWith(httpClient, logger); expect(dispatch).toHaveBeenCalledWith( --- package-lock.json @@ -40,7 +40,7 @@ "@walmart/allspark-neon-core": "0.1.31", "@walmart/amp-mini-app": "1.1.79", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.19.5", + "@walmart/ask-sam-mini-app": "1.20.3", "@walmart/attendance-mini-app": "3.24.0", "@walmart/avp-feature-app": "0.1.5", "@walmart/avp-shared-library": "0.1.6", @@ -92,7 +92,7 @@ "@walmart/schedule-mini-app": "0.93.0", "@walmart/shelfavailability-mini-app": "1.5.19", "@walmart/store-feature-orders": "1.26.2", - "@walmart/taskit-mini-app": "2.57.6", + "@walmart/taskit-mini-app": "2.62.3", "@walmart/time-clock-mini-app": "2.338.1", "@walmart/topstock-mini-app": "1.7.1", "@walmart/ui-components": "1.15.9", @@ -8433,9 +8433,9 @@ } }, "node_modules/@walmart/ask-sam-mini-app": { - "version": "1.19.5", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.19.5.tgz", - "integrity": "sha512-OaWUlDRDWZCEWHKZhxrWgK2XLTfMjf4eY53zTy2q+oX0vqwQKbTuVEstp+w7blpCLsEIgNR09iEcfnetQKY1vQ==", + "version": "1.20.3", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.20.3.tgz", + "integrity": "sha512-Ju3p5xQjUFnM9ytV5PHORSfEt3ySrDynWreviookPZ71ltCM7/fM1bd6SSgEMdrWcEEnYhUVoDhjNlA8RlbB2A==", "license": "NONE", "dependencies": { "apisauce": "^1.1.2", @@ -8452,7 +8452,7 @@ "@walmart/core-services": ">=1.4.11", "@walmart/core-utils": ">=1.2", "@walmart/core-widget-registry": ">=0.2", - "@walmart/gtp-shared-components": ">=2.1.10", + "@walmart/gtp-shared-components": ">=2.1.3", "@walmart/redux-store": ">=3.1.4", "@walmart/schedule-mini-app": "*", "@walmart/ui-components": ">=1.5", @@ -9843,9 +9843,9 @@ } }, "node_modules/@walmart/taskit-mini-app": { - "version": "2.57.6", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.57.6.tgz", - "integrity": "sha512-qy90YQKvjMfQVXY05iykF82KqlpsJt+6JIBH739b3DjW9pTHPjglgL8RimeS3iQZijokHzT5b9FhyXxFjuR6Zg==", + "version": "2.62.3", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.62.3.tgz", + "integrity": "sha512-cWl6Ac6NE3awa4rbGsarPU5kBlGS+ax84wTciGaV1w28HvfbjEHHNCIOzwswHBNw6FB+9Le489P4iTIE7MMugg==", "peerDependencies": { "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@types/lodash": ">=4.14.176", @@ -33105,9 +33105,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "1.19.5", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.19.5.tgz", - "integrity": "sha512-OaWUlDRDWZCEWHKZhxrWgK2XLTfMjf4eY53zTy2q+oX0vqwQKbTuVEstp+w7blpCLsEIgNR09iEcfnetQKY1vQ==", + "version": "1.20.3", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.20.3.tgz", + "integrity": "sha512-Ju3p5xQjUFnM9ytV5PHORSfEt3ySrDynWreviookPZ71ltCM7/fM1bd6SSgEMdrWcEEnYhUVoDhjNlA8RlbB2A==", "requires": { "apisauce": "^1.1.2", "axios-cache-adapter": "^2.7.3", @@ -33530,9 +33530,9 @@ "integrity": "sha512-ja5c4CSJhbyaJJ9st8PECEOHSBhBfBRM2nnVpwTY9RmS8Ta9GYuDa5eCol8DUpOfbkTod+vsgBBNSQUqEnc7SQ==" }, "@walmart/taskit-mini-app": { - "version": "2.57.6", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.57.6.tgz", - "integrity": "sha512-qy90YQKvjMfQVXY05iykF82KqlpsJt+6JIBH739b3DjW9pTHPjglgL8RimeS3iQZijokHzT5b9FhyXxFjuR6Zg==" + "version": "2.62.3", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.62.3.tgz", + "integrity": "sha512-cWl6Ac6NE3awa4rbGsarPU5kBlGS+ax84wTciGaV1w28HvfbjEHHNCIOzwswHBNw6FB+9Le489P4iTIE7MMugg==" }, "@walmart/tcnumber": { "version": "2.3.3", --- package.json @@ -81,7 +81,7 @@ "@walmart/allspark-neon-core": "0.1.31", "@walmart/amp-mini-app": "1.1.79", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.19.5", + "@walmart/ask-sam-mini-app": "1.20.3", "@walmart/attendance-mini-app": "3.24.0", "@walmart/avp-feature-app": "0.1.5", "@walmart/avp-shared-library": "0.1.6", @@ -133,7 +133,7 @@ "@walmart/schedule-mini-app": "0.93.0", "@walmart/shelfavailability-mini-app": "1.5.19", "@walmart/store-feature-orders": "1.26.2", - "@walmart/taskit-mini-app": "2.57.6", + "@walmart/taskit-mini-app": "2.62.3", "@walmart/time-clock-mini-app": "2.338.1", "@walmart/topstock-mini-app": "1.7.1", "@walmart/ui-components": "1.15.9", --- src/startup/AssociateStartup.ts @@ -6,6 +6,7 @@ import {IAllsparkLogger} from '@walmart/core-services-allspark'; import {useHttpClient} from '@walmart/allspark-http-client'; import {useLogger} from '@walmart/core-services/Logger'; import {registerAskSamWidgets} from '@walmart/metrics-mini-app'; +import {registerAskSamWidgetsForNotes} from '@walmart/taskit-mini-app'; import {initNavConfig} from '../navConfig'; import {surveySagas} from '../survey/SurveySaga'; @@ -21,6 +22,7 @@ export const useAssociateStartup = () => { const httpClient = useHttpClient(); registerAskSamWidgets(); + registerAskSamWidgetsForNotes(); useRbacConfig(httpClient, logger);
taskit version update
taskit version update
814d6292744589ea5c6c222612d07aa3d0b6ea2c
--- packages/allspark-foundation/src/Container/AllsparkContainer.tsx @@ -16,9 +16,10 @@ import { AllsparkReduxStore } from '../Redux'; import { AllsparkReduxProvider } from '../Redux/provider'; import { TranslationProvider } from '../Translation/provider'; -import { ContainerActionCreators } from './redux'; import { SetupGuard } from './SetupGuard'; +import { ContainerActionCreators } from './redux'; import { AllsparkServiceGuard } from './services'; +import { DEFAULT_STATUSBAR_PROPS } from './constants'; import { AllsparkContainerConfig, ContainerProviderProps } from './types'; /** @@ -62,7 +63,7 @@ export class AllsparkContainer<E extends IAllsparkEnvironment> { * if using AllsparkFeatures. */ public Provider(props: PropsWithChildren<ContainerProviderProps<E>>) { - const { children, env, environmentOverrides = {} } = props; + const { children, env, environmentOverrides = {}, statusBar = {} } = props; const overrides = { ...environmentOverrides, containerName: this.id }; @@ -75,7 +76,7 @@ export class AllsparkContainer<E extends IAllsparkEnvironment> { return ( <SafeAreaProvider> - <StatusBar barStyle='light-content' /> + <StatusBar {...DEFAULT_STATUSBAR_PROPS} {...statusBar} /> <GestureHandlerRootView style={{ flex: 1 }}> <LivingDesignProvider> <AllsparkReduxProvider config={this.config.redux}> --- packages/allspark-foundation/src/Container/constants.ts @@ -0,0 +1,7 @@ +import { StatusBarProps } from 'react-native'; + +export const DEFAULT_STATUSBAR_PROPS = { + translucent: true, + barStyle: 'light-content', + backgroundColor: 'transparent', +} as StatusBarProps; --- packages/allspark-foundation/src/Container/types.ts @@ -1,3 +1,4 @@ +import { StatusBarProps } from 'react-native'; import { RecursivePartial } from '@walmart/allspark-utils'; import { EnvironmentConfigMap, @@ -21,6 +22,7 @@ import { FeatureRunnerNavigationConfig } from '../FeatureRunner'; export type ContainerProviderProps<E extends IAllsparkEnvironment> = { env: EnvironmentType; environmentOverrides?: RecursivePartial<E>; + statusBar?: StatusBarProps; }; /**
feat: add status bar configuration props to container provider
feat: add status bar configuration props to container provider
49ee8876f1b664d45aa809663f44bb7dee92cee6
--- Gemfile @@ -1,7 +1,3 @@ -# Autogenerated by fastlane -# -# Ensure this file is checked in to source control! - source 'https://repository.walmart.com/content/repositories/rubygems' gem 'fastlane' @@ -9,8 +5,12 @@ gem 'fastlane' plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') eval_gemfile(plugins_path) if File.exist?(plugins_path) +# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version +ruby ">= 2.6.10" + # Cocoapods 1.15 introduced a bug which break the build. We will remove the upper # bound in the template on Cocoapods with next React Native release. gem 'cocoapods', '>= 1.13', '< 1.15' gem 'activesupport', '>= 6.1.7.5', '< 7.1.0' -gem 'xcodeproj', '1.27.0' +gem 'xcodeproj', '< 1.26.0' +gem 'concurrent-ruby', '<= 1.3.4'
chore: update gemfile to match latest react native template
chore: update gemfile to match latest react native template
da3912ea50466bf8b6ec09898dea0833634ea547
--- __tests__/navigation/USHallway/ErrorLogBoundaryTest.tsx @@ -31,6 +31,7 @@ describe('ErrorLogBoundary', () => { 'BOUNDARY_ERROR', { message: childError, + stack: expect.any(String), // stack trace will be dynamic depending on test run location }, ); } @@ -47,6 +48,7 @@ describe('ErrorLogBoundary', () => { 'BOUNDARY_ERROR', { message: childError, + stack: expect.any(String), // stack trace will be dynamic depending on test run location }, ); }); --- src/navigation/USHallway/ErrorLogBoundary.ts @@ -5,6 +5,7 @@ export class ErrorLogBoundary extends Component<PropsWithChildren<{}>> { componentDidCatch(e: Error) { LoggerService.getContainerInstance().error('BOUNDARY_ERROR', { message: e.message, + stack: e.stack || 'stack trace not available', }); // We will let app crash by rethrowing the error
feat: add stack trace on boundary error (#4387)
feat: add stack trace on boundary error (#4387)
4838f348b61eaec956bf945177fca444c3cba984
--- env.prod.js @@ -40,7 +40,7 @@ export default { candidateAuthConfig: { issuer: 'https://pfedprod.wal-mart.com', clientId: 'WMProd', - redirectUrl: 'com.walmart.stores.allspark.beta://CandidateLogin', + redirectUrl: 'com.walmart.squiggly://CandidateLogin', scopes: ['openid', 'full'], additionalParameters: { // settings this would force a login every time we sign out and back in
update the URI for candidate mdoe
update the URI for candidate mdoe update the URI for candidate mdoe
1fde2278294ad76971ec09dcbbada1c28034aa18
--- __tests__/core/DeeplinkConfigTest.ts @@ -17,7 +17,8 @@ describe('link config test', () => { screens: { Returns: { screens: { - 'Returns.Landing': 'returns/:siteId/:printerAddress/:orderNumber?/:checkinId?', + 'Returns.Landing': + 'returns/:siteId/:printerAddress/:orderNumber?/:checkinId?', }, }, }, --- src/core/DeeplinkConfig.ts @@ -15,7 +15,8 @@ export type AppRootParamList = { }; const returnsConfig = { - 'Returns.Landing': 'returns/:siteId/:printerAddress/:orderNumber?/:checkinId?', + 'Returns.Landing': + 'returns/:siteId/:printerAddress/:orderNumber?/:checkinId?', }; const prefixes = ['meatwmt://'];
Lint fix
Lint fix
7a39fa7be52baae8bf168c780eaecf4016ea79a0
--- package.json @@ -175,7 +175,7 @@ "expo-constants": "~17.0.8", "expo-file-system": "18.0.12", "expo-font": "~13.0.4", - "expo-haptics": "^14.1.4", + "expo-haptics": "~14.0.1", "expo-image": "patch:expo-image@npm%3A2.0.7#~/.yarn/patches/expo-image-npm-2.0.7-adb639d59c.patch", "expo-image-manipulator": "~12.0.5", "expo-image-picker": "~15.1.0", --- yarn.lock @@ -7522,7 +7522,7 @@ __metadata: expo-doctor: "npm:^1.10.1" expo-file-system: "npm:18.0.12" expo-font: "npm:~13.0.4" - expo-haptics: "npm:^14.1.4" + expo-haptics: "npm:~14.0.1" expo-image: "patch:expo-image@npm%3A2.0.7#~/.yarn/patches/expo-image-npm-2.0.7-adb639d59c.patch" expo-image-manipulator: "npm:~12.0.5" expo-image-picker: "npm:~15.1.0" @@ -12567,12 +12567,12 @@ __metadata: languageName: node linkType: hard -"expo-haptics@npm:^14.1.4": - version: 14.1.4 - resolution: "expo-haptics@npm:14.1.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fexpo-haptics%2F-%2Fexpo-haptics-14.1.4.tgz" +"expo-haptics@npm:~14.0.1": + version: 14.0.1 + resolution: "expo-haptics@npm:14.0.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fexpo-haptics%2F-%2Fexpo-haptics-14.0.1.tgz" peerDependencies: expo: "*" - checksum: 10c0/c8d4dd80fec8949b39af27b718383526b268b56cae4465af57ea7c5d470b34933c03574dc9c0baca06cf81018cc1eb63671a84a273abca685efb02cfd1604e3e + checksum: 10c0/31a77f7fb2f9a3db586ca34e9fb80b9b03f29ed93aa045eeba3facec31bd71537c7a10c10c90b54cadec2334aad44df4a3cc5f99af1ca33f63f349b5547fdb43 languageName: node linkType: hard
feat(lib): ALLSPRAK-0000 downgrade expo-haptics (#4388)
feat(lib): ALLSPRAK-0000 downgrade expo-haptics (#4388) Co-authored-by: Maksym Novakh <maksym.novakh@walmart.com>
7e4feddd932ebfeb43201660a49794f65eedabcf
--- .gitignore @@ -50,4 +50,9 @@ ios/ #Yarn install-state.gz -build.context.json \ No newline at end of file +build.context.json + +.claude-flow +.swarm +.yalc +yalc.lock
chore(yalc): add yalc config to gitignore
chore(yalc): add yalc config to gitignore
e621a94539a59efe9c02a92855bf71ecb6303b61
--- targets/US/package.json @@ -144,7 +144,7 @@ "@walmart/roster-mini-app": "2.8.2", "@walmart/schedule-mini-app": "0.118.0", "@walmart/shelfavailability-mini-app": "1.5.33", - "@walmart/shop-gnfr-mini-app": "1.0.120", + "@walmart/shop-gnfr-mini-app": "1.0.121", "@walmart/sidekick-mini-app": "4.67.15", "@walmart/store-feature-orders": "1.26.12", "@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.3.0#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.3.0-a2dd632c59.patch", --- yarn.lock @@ -7141,7 +7141,7 @@ __metadata: "@walmart/roster-mini-app": "npm:2.8.2" "@walmart/schedule-mini-app": "npm:0.118.0" "@walmart/shelfavailability-mini-app": "npm:1.5.33" - "@walmart/shop-gnfr-mini-app": "npm:1.0.120" + "@walmart/shop-gnfr-mini-app": "npm:1.0.121" "@walmart/sidekick-mini-app": "npm:4.67.15" "@walmart/store-feature-orders": "npm:1.26.12" "@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.3.0#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.3.0-a2dd632c59.patch" @@ -8017,9 +8017,9 @@ __metadata: languageName: node linkType: hard -"@walmart/shop-gnfr-mini-app@npm:1.0.120": - version: 1.0.120 - resolution: "@walmart/shop-gnfr-mini-app@npm:1.0.120" +"@walmart/shop-gnfr-mini-app@npm:1.0.121": + version: 1.0.121 + resolution: "@walmart/shop-gnfr-mini-app@npm:1.0.121" dependencies: "@testing-library/react-native": "npm:^12.5.1" react-native-drop-shadow: "npm:^1.0.0" @@ -8033,7 +8033,7 @@ __metadata: "@walmart/gtp-shared-components": ^2.0.0 react: ^18.2.0 react-native: ~0.70.5 - checksum: 10c0/4369b5c7be869bdffa8b5f266c978061b15c38714f65c926a31d0264a59eea65a025c0bc691e99f994521811537b0a86d9167c18baea9cbb28b7bf4c66552b2d + checksum: 10c0/70b1a7b7c5893148c2415ead723e8f6cf515008a1408832a966429cac357280ec1bf5aa9541991ce21eabe6f0c39f780d9030a33957d0c4f0c9caba782980930 languageName: node linkType: hard
added version 1.0.21
added version 1.0.21
3f21901d877ed9d53cb25702c505bd994fcb3fa2
--- android/app/build.gradle @@ -158,8 +158,8 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 908 - versionName "1.11.0" + versionCode 909 + versionName "1.12.0" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { // We configure the CMake build only if you decide to opt-in for the New Architecture. --- ios/AllSpark/Info.plist @@ -19,7 +19,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.11.0</string> + <string>1.12.0</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -36,7 +36,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>908</string> + <string>909</string> <key>FirebaseAutomaticScreenReportingEnabled</key> <false /> <key>LSApplicationQueriesSchemes</key> @@ -53,30 +53,30 @@ <dict> <key>NSExceptionDomains</key> <dict> - <key>mqtt.ss.glb.us.walmart.net</key> + <key>mqtt.ss.glb.us.walmart.net</key> <dict> <key>NSExceptionAllowsInsecureHTTPLoads</key> - <true/> + <true /> </dict> <key>ptt-vernemq-teflon_lb.cloud.wal-mart.com</key> <dict> <key>NSExceptionAllowsInsecureHTTPLoads</key> - <true/> + <true /> </dict> <key>teflon.ptt.walmart.com</key> <dict> <key>NSExceptionAllowsInsecureHTTPLoads</key> - <true/> + <true /> </dict> <key>dv.ptt.walmart.com</key> <dict> <key>NSExceptionAllowsInsecureHTTPLoads</key> - <true/> + <true /> </dict> <key>vmq.ss.glb-qa.torbit.walmart.net</key> <dict> <key>NSExceptionAllowsInsecureHTTPLoads</key> - <true/> + <true /> </dict> <key>i5.walmartimages.com</key> <dict> --- package-lock.json @@ -1,12 +1,12 @@ { "name": "allspark-main", - "version": "1.11.0", + "version": "1.12.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "allspark-main", - "version": "1.11.0", + "version": "1.12.0", "hasInstallScript": true, "dependencies": { "@react-native-community/art": "^1.2.0", --- package.json @@ -1,6 +1,6 @@ { "name": "allspark-main", - "version": "1.11.0", + "version": "1.12.0", "private": true, "scripts": { "android": "react-native run-android",
version bump to 1.12.0
version bump to 1.12.0
515c5f0ce6eb6e72662cacdd93f9750201bcf521
--- targets/US/package.json @@ -86,7 +86,7 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.24.7", "@walmart/associate-listening-mini-app": "1.2.7", - "@walmart/attendance-mini-app": "3.70.0", + "@walmart/attendance-mini-app": "3.71.0", "@walmart/avp-feature-app": "0.10.7", "@walmart/avp-shared-library": "0.10.1", "@walmart/backroom-mini-app": "1.5.20", --- yarn.lock @@ -6001,9 +6001,9 @@ __metadata: languageName: node linkType: hard -"@walmart/attendance-mini-app@npm:3.70.0": - version: 3.70.0 - resolution: "@walmart/attendance-mini-app@npm:3.70.0" +"@walmart/attendance-mini-app@npm:3.71.0": + version: 3.71.0 + resolution: "@walmart/attendance-mini-app@npm:3.71.0" dependencies: "@walmart/wfm-ui": "npm:^0.2.26" moment-timezone: "npm:0.5.40" @@ -6033,7 +6033,7 @@ __metadata: redux-saga: ^1.2.0 reselect: ^4.1.0 wfm-allspark-data-library: ^3.3.0 - checksum: 10c0/d830f6927c65119ea316ab61bb9a3dc656429976e7ebf04a1432d555cda3605e33d492cb924ecc2fa7c2534f216c77f697976197bdfd59a1ec35366094c0fe3a + checksum: 10c0/39a130a4684bf38103014a09f7e1ab4871885d1f0e7bc43baa261bf629d95f68b980d1f6e1be5ec097823a10e1e9b66b229c76a568f120d235a95d09318d0a05 languageName: node linkType: hard @@ -6993,7 +6993,7 @@ __metadata: "@walmart/ask-sam-chat-components": "npm:^0.2.7" "@walmart/ask-sam-mini-app": "npm:1.24.7" "@walmart/associate-listening-mini-app": "npm:1.2.7" - "@walmart/attendance-mini-app": "npm:3.70.0" + "@walmart/attendance-mini-app": "npm:3.71.0" "@walmart/avp-feature-app": "npm:0.10.7" "@walmart/avp-shared-library": "npm:0.10.1" "@walmart/backroom-mini-app": "npm:1.5.20"
bump up attd mini app version fixing navigation issue for tor
bump up attd mini app version fixing navigation issue for tor
b2520fb37f6aaded5fe35b980e23ba1378183e61
--- package.json @@ -174,7 +174,7 @@ "@walmart/time-clock-feature-app": "1.0.0-beta.1", "@walmart/time-clock-mini-app": "patch:@walmart/time-clock-mini-app@npm%3A3.19.10#~/.yarn/patches/@walmart-time-clock-mini-app-npm-3.19.10-d3039974f6.patch", "@walmart/timesheet-feature-app": "0.2.0-beta.10", - "@walmart/topstock-mini-app": "1.27.1", + "@walmart/topstock-mini-app": "1.28.12", "@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.27.0", "@walmart/walmart-fiscal-week": "^0.3.6", --- yarn.lock @@ -8594,7 +8594,7 @@ __metadata: "@walmart/time-clock-feature-app": "npm:1.0.0-beta.1" "@walmart/time-clock-mini-app": "patch:@walmart/time-clock-mini-app@npm%3A3.19.10#~/.yarn/patches/@walmart-time-clock-mini-app-npm-3.19.10-d3039974f6.patch" "@walmart/timesheet-feature-app": "npm:0.2.0-beta.10" - "@walmart/topstock-mini-app": "npm:1.27.1" + "@walmart/topstock-mini-app": "npm:1.28.12" "@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.27.0" "@walmart/walmart-fiscal-week": "npm:^0.3.6" @@ -9709,21 +9709,19 @@ __metadata: languageName: node linkType: hard -"@walmart/topstock-mini-app@npm:1.27.1": - version: 1.27.1 - resolution: "@walmart/topstock-mini-app@npm:1.27.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ftopstock-mini-app%2F-%2F%40walmart%2Ftopstock-mini-app-1.27.1.tgz" +"@walmart/topstock-mini-app@npm:1.28.12": + version: 1.28.12 + resolution: "@walmart/topstock-mini-app@npm:1.28.12::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ftopstock-mini-app%2F-%2F%40walmart%2Ftopstock-mini-app-1.28.12.tgz" peerDependencies: "@react-navigation/native": ">=5.8.10" "@react-navigation/stack": ">=5.12.8" "@walmart/allspark-foundation": "*" - "@walmart/core-services": "*" - "@walmart/core-services-allspark": "*" "@walmart/ui-components": ">=1.0.79" i18next: ">=19.5.1" react-i18next: ">=11.7.3" react-native-vector-icons: ">=6.6.0" react-redux: ">=7.2.0" - checksum: 10c0/27da4f37042fba7e5a7d2846c5ddd7beb6d06236c678eafdebf5bc740e8f5610dba4a0a5edb36619ebbfdf019d534a0c34368d57a4cbea54f942cf912db7149e + checksum: 10c0/979c987ff564a4dfa520f0239fe7d7216c91b9a0aea90543a1f5991dbafe5891d095d969f20a8163c9e5a25700b9cb1588b3e7c0473e808924fad55e9334ddea languageName: node linkType: hard
fix(topstock): version update for drop 35 (#4993)
fix(topstock): version update for drop 35 (#4993) Co-authored-by: t0s0qvk <t0s0qvk@walmart.com> Co-authored-by: Aroushi Sharma - a0s11tw <Aroushi.Sharma@walmart.com> Co-authored-by: Hariharan Sundaram <121838+h0s0em0@users.noreply.gecgithub01.walmart.com> Co-authored-by: Hariharan Sundaram <hariharan.sundaram0@walmart.com> Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com> Co-authored-by: Yarien Mendez Suarez - y0m07dz <Yarien.Mendez.Suarez@walmart.com> Co-authored-by: Pavan Lingamallu - p0l04ug <Pavan.Lingamallu@walmart.com>
68681a0aaaabdfd94b5276fe9b2d0eff24f8387d
--- packages/allspark-foundation/__tests__/Container/AllspartContainer.test.tsx @@ -11,50 +11,103 @@ jest.mock('../../src/Environment', () => ({ }, BaseAllsparkEnvironment: jest.requireActual('../../src/Environment').BaseAllsparkEnvironment, })); + jest.mock('../../src/Logger', ()=>({ + LoggerServiceCreator: jest.fn() + })) + jest.mock('../../src/Site', ()=>({ + SiteServiceCreator: jest.fn() + })) jest.mock('../../src/Redux', () => ({ AllsparkReduxStore: { dispatch: jest.fn(), configure: jest.fn(), }, + original: { + addChangeListener: jest.fn(), + }, + ContainerActionCreators: { + FLOW_START: jest.fn((type) => ({ type: 'FLOW_START', payload: type })), + FLOW_COMPLETE: jest.fn((type) => ({ type: 'FLOW_COMPLETE', payload: type })), + }, + })); + + jest.mock('../../src/Clock', () => ({ + original: { + addChangeListener: jest.fn(), + }, + ClockServiceCreator: jest.fn(), + + })); + + jest.mock('../../src/Config', () => ({ + original: { + addChangeListener: jest.fn(), + }, + ConfigServiceCreator: jest.fn() + })); + jest.mock('../../src/Location', () => ({ + original: { + addChangeListener: jest.fn(), + }, + LocationServiceCreator: jest.fn(), + })); + jest.mock('../../src/Navigation/config', () => ({ + original: { + addChangeListener: jest.fn(), + }, })); - jest.mock('../../src/Translation', () => ({ AllsparkTranslationClient: { initialize: jest.fn(), }, + LocationServiceCreator: jest.fn() })); jest.mock('../../src/HTTP', () => ({ AllsparkHttpClient: { configure: jest.fn(), }, + LocationServiceCreator: jest.fn() })); jest.mock('../../src/GraphQL', () => ({ AllsparkGraphQLClient: { configure: jest.fn(), }, + LocationServiceCreator: jest.fn() })); jest.mock('../../src/Network', () => ({ AllsparkNetworkClient: { initialize: jest.fn(), }, + LocationServiceCreator: jest.fn() })); jest.mock('../../src/Notification', () => ({ AllsparkNotificationClient: { configure: jest.fn(), }, + LocationServiceCreator: jest.fn() })); jest.mock('../../src/Navigation', () => ({ AllsparkNavigationClient: { configure: jest.fn(), }, + NavConfigServiceCreator: jest.fn(), + })); + + jest.mock('../../src/Auth', () => ({ + AuthServiceCreator: jest.fn() + })); + jest.mock('../../src/Telemetry', () => ({ + TelemetryServiceCreator: jest.fn() + })); + jest.mock('../../src/User', () => ({ + UserServiceCreator: jest.fn() })); - describe('AllsparkContainer', () => { let container; beforeEach(() => { @@ -150,7 +203,91 @@ describe('AllsparkContainer', () => { unmount(); expect(mockFeature.disconnect).toHaveBeenCalled(); }); + it('test SetupGuard method', async () => { + const setupType = 'testSetupType'; + const mockRunSetup = jest.spyOn(container, 'runSetup').mockImplementation(() => Promise.resolve()); + const { unmount } = render( + container.SetupGuard({ + setupType, + children: <div>Test Content</div>, + }) + ); + expect(mockRunSetup).toHaveBeenCalledWith(setupType); + unmount(); + }); + it('test ConnectGuard method', async () => { + const mockConnectFeatures = jest.spyOn(container, 'connectFeatures').mockImplementation(() => {}); + const mockDisconnect = jest.spyOn(container.features, 'disconnect').mockImplementation(() => {}); + const config = { featureId: 'testFeatureId' }; + const { unmount } = render( + container.ConnectGuard({ + ...config, + children: <div>Test Content</div>, + }) + ); + + expect(mockConnectFeatures).toHaveBeenCalledWith(config); + unmount(); + expect(mockDisconnect).toHaveBeenCalledWith(config); + }); + it('test runFlow metod', () => { + const mockFlowFunction1 = jest.fn(() => 'result1'); + const mockFlowFunction2 = jest.fn(() => 'result2'); + container['_flowMap'] = new Map([ + ['TYPE_1', [mockFlowFunction1, mockFlowFunction2]], + ]); + const flowGenerator = container.runFlow('TYPE_1'); + const result1 = flowGenerator.next(); + expect(mockFlowFunction1).toHaveBeenCalled(); + expect(result1.value).toBe('result1'); + const result2 = flowGenerator.next(); + expect(mockFlowFunction2).toHaveBeenCalled(); + expect(result2.value).toBe('result2'); + const finalResult = flowGenerator.next(); + expect(finalResult.done).toBe(true); }); +it('should call all service creators and run root setup', async () => { + const config = { + components: {}, + services: { + auth: jest.fn(), + clock: jest.fn(), + config: jest.fn(), + device: jest.fn(), + location: jest.fn(), + logger: jest.fn(), + navConfig: jest.fn(), + site: jest.fn(), + telemetry: jest.fn(), + user: jest.fn(), + }, + setup: { + root: jest.fn().mockResolvedValue(true), + }, + }; + const container = new AllsparkContainer('test-container', config); + const runSetupSpy = jest.spyOn(container, 'runSetup').mockResolvedValueOnce(undefined); + await container['_rootSetup'](); + expect(runSetupSpy).toHaveBeenCalledWith('root'); + }); + it('test for disableFeature and screens', () => { + const mockDisableFeature = jest.fn(); + const mockScreens = {}; + container['features'] = { + disableFeature: mockDisableFeature, + Screens: mockScreens, + } as any; + //disableFeature + const featureId = 'feature_123'; + container.disableFeature(featureId); + expect(mockDisableFeature).toHaveBeenCalledWith(featureId); - \ No newline at end of file + //screens + const result = container.Screens; + expect(result).toBe(mockScreens); +}); + +}); + +
more unit test for container component
more unit test for container component
16c63d22b4a499548007840af9324df04fa1f111
--- __tests__/harness/redux/mockState/index.ts @@ -19,5 +19,5 @@ export const initialStateMock: GlobalState = { versions: versionsState, deviceInfo: deviceInfoState, appConfig: appConfigState, - //texting: textingState, + //texting: textingState, //TODO: redux-store library needs mod to combineReducers to support this type }; --- __tests__/harness/redux/mockState/index.ts @@ -19,5 +19,5 @@ export const initialStateMock: GlobalState = { versions: versionsState, deviceInfo: deviceInfoState, appConfig: appConfigState, - //texting: textingState, + //texting: textingState, //TODO: redux-store library needs mod to combineReducers to support this type };
add todo
add todo
30febe7f4cb70b6a33b9a6ca4d1b919c5cdb1036
--- .looper.multibranch.yml @@ -24,7 +24,7 @@ envs: ANDROID_BASE_PATH: targets/US/android branches: - - spec: feature/drop24 + - spec: feature/topstock-drop24-1 triggers: - manual: name: Publish Packages (Pre-Release) --- targets/US/package.json @@ -148,7 +148,7 @@ "@walmart/store-feature-orders": "1.26.12", "@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.3.0#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.3.0-a2dd632c59.patch", "@walmart/time-clock-mini-app": "2.400.0", - "@walmart/topstock-mini-app": "1.15.20", + "@walmart/topstock-mini-app": "1.16.16", "@walmart/ui-components": "patch:@walmart/ui-components@patch%3A@walmart/ui-components@npm%253A1.16.1%23~/.yarn/patches/@walmart-ui-components-npm-1.16.1-c240fb0151.patch%3A%3Aversion=1.16.1&hash=79c828#~/.yarn/patches/@walmart-ui-components-patch-cd5ae6f92c.patch", "@walmart/welcomeme-mini-app": "0.95.1", "@walmart/wfm-ui": "1.6.0", --- yarn.lock @@ -7126,7 +7126,7 @@ __metadata: "@walmart/store-feature-orders": "npm:1.26.12" "@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.3.0#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.3.0-a2dd632c59.patch" "@walmart/time-clock-mini-app": "npm:2.400.0" - "@walmart/topstock-mini-app": "npm:1.15.20" + "@walmart/topstock-mini-app": "npm:1.16.16" "@walmart/ui-components": "patch:@walmart/ui-components@patch%3A@walmart/ui-components@npm%253A1.16.1%23~/.yarn/patches/@walmart-ui-components-npm-1.16.1-c240fb0151.patch%3A%3Aversion=1.16.1&hash=79c828#~/.yarn/patches/@walmart-ui-components-patch-cd5ae6f92c.patch" "@walmart/welcomeme-mini-app": "npm:0.95.1" "@walmart/wfm-ui": "npm:1.6.0" @@ -8113,9 +8113,9 @@ __metadata: languageName: node linkType: hard -"@walmart/topstock-mini-app@npm:1.15.20": - version: 1.15.20 - resolution: "@walmart/topstock-mini-app@npm:1.15.20" +"@walmart/topstock-mini-app@npm:1.16.16": + version: 1.16.16 + resolution: "@walmart/topstock-mini-app@npm:1.16.16" peerDependencies: "@react-native-firebase/app": ^15.1.1 "@react-native-firebase/crashlytics": ^15.1.1 @@ -8132,7 +8132,7 @@ __metadata: react-native-haptic-feedback: ^1.13.0 react-native-vector-icons: ">=6.6.0" react-redux: ">=7.2.0" - checksum: 10c0/90baf8d0a306aad2953f3228312b0c4daf48dda6c7cbf0225be417e495cb39d5bcea082199c6b3fceda1b279474f489efc3d2f419c722dc783e6161e20a3365e + checksum: 10c0/001cce7a5436cf0d28856a947c641e956dd2deaaef492469eb38629969e74b74d16456993a258e7f042b146269e665709716aeea2b93435e59315d667a427cd1 languageName: node linkType: hard
fix(): updated topstock version to 1.16.16
fix(): updated topstock version to 1.16.16
89dd4a69e27cecd5a16370842f56ae1c7fe63068
--- __tests__/home/components/GreetingRowV2/useUserInfoTest.ts @@ -6,11 +6,11 @@ jest.mock('@walmart/me-at-walmart-athena-queries', () => ({ useGetForYouHeaderAssociateDetailsQuery: jest.fn(), })); -// Mock environment to include http.consumerId2 expected by hook +// Mock environment to include http.consumerIdHeader expected by hook jest.mock('@walmart/allspark-foundation/Environment', () => ({ useEnvironment: jest.fn(() => ({ - http: {consumerId2: 'test-consumer-id'}, + http: {consumerIdHeader: 'test-consumer-id'}, env: 'test', })), })); --- packages/me-at-walmart-container/src/environment/env.beta.ts @@ -34,7 +34,7 @@ const config: IMeAtWalmartEnvironment = { }, http: { consumerId: '364a55bb-7f04-4a7c-a800-1d91c08fe5f2', - consumerId2: '8c25ca50-0246-45d3-ae57-f72322894df9', + consumerIdHeader: '8c25ca50-0246-45d3-ae57-f72322894df9', internalUrl: 'https://api-proxy-es2.prod-us-azure.soa-api-proxy.platform.prod.us.walmart.net', externalUrl: 'https://developer.api.us.walmart.com', --- packages/me-at-walmart-container/src/environment/env.dev.ts @@ -36,7 +36,7 @@ const config: IMeAtWalmartEnvironment = { }, http: { consumerId: 'b5fc6fe0-5927-44a6-a693-6e922e830b04', - consumerId2: '9a85eec7-f87c-4bca-9a45-74cc6578c787', + consumerIdHeader: '9a85eec7-f87c-4bca-9a45-74cc6578c787', internalUrl: 'https://api-proxy.stg.soa-api-proxy.platform.glb.prod.walmart.com', externalUrl: 'https://developer.api.us.stg.walmart.com', --- packages/me-at-walmart-container/src/environment/env.prod.ts @@ -34,7 +34,7 @@ const config: IMeAtWalmartEnvironment = { }, http: { consumerId: '364a55bb-7f04-4a7c-a800-1d91c08fe5f2', - consumerId2: '8c25ca50-0246-45d3-ae57-f72322894df9', + consumerIdHeader: '8c25ca50-0246-45d3-ae57-f72322894df9', internalUrl: 'https://api-proxy-es2.prod-us-azure.soa-api-proxy.platform.prod.us.walmart.net', externalUrl: 'https://developer.api.us.walmart.com', --- packages/me-at-walmart-container/src/environment/env.teflon.ts @@ -34,7 +34,7 @@ const config: IMeAtWalmartEnvironment = { }, http: { consumerId: 'b5fc6fe0-5927-44a6-a693-6e922e830b04', - consumerId2: '9a85eec7-f87c-4bca-9a45-74cc6578c787', + consumerIdHeader: '9a85eec7-f87c-4bca-9a45-74cc6578c787', internalUrl: 'https://api-proxy.stg.soa-api-proxy.platform.glb.prod.walmart.com', externalUrl: 'https://developer.api.us.stg.walmart.com', --- src/home/components/GreetingRowV2/useUserInfo.ts @@ -164,7 +164,7 @@ export const useUserInfo = ( }, context: { headers: { - 'wm_consumer.id': env.http.consumerId2, + 'wm_consumer.id': env.http.consumerIdHeader, 'x-o-platform': 'allspark-core', 'x-o-platform-version': getVersion(), },
feat(header): change naming
feat(header): change naming
a41e2051d7abdc14f70f65d70020260050cbbf50
--- __tests__/redux/UserSelectorTest.ts @@ -25,7 +25,7 @@ import { getUserWorkingSite, getUserWorkingSitePresent, getUserType, - getUserWorkingSiteMissing, + getUserSitePresent, getIsPreHire, getShouldPromptForSite, getShouldHideSplashOnAuth, @@ -539,31 +539,65 @@ describe('getUserType', () => { }); }); -describe('getUserWorkingSiteMissing', () => { - it('handles workingSite domain and present', () => { +describe('getUserSitePresent', () => { + it('handles dc user with working site', () => { const data = { userId: 'swalton3', - siteId: '100', - domain: 'DC', + siteId: 'NOT_FOUND', workingSite: '9050', + domain: 'Distribution Center', }; - const workingSiteMissing = getUserWorkingSiteMissing({ + const sitePresent = getUserSitePresent({ user: {data}, } as State); - expect(workingSiteMissing).toEqual(false); + expect(sitePresent).toEqual(true); }); - it('handles missing working site', () => { + it('handles dc user without workingSite', () => { const data = { userId: 'swalton3', - siteId: '100', + siteId: 'NOT_FOUND', + workingSite: 'NOT_FOUND', domain: 'Distribution Center', + }; + const sitePresent = getUserSitePresent({ + user: {data}, + } as State); + expect(sitePresent).toEqual(false); + }); + + it('handles store user without siteId', () => { + const data = { + userId: 'swalton3', + siteId: undefined, workingSite: 'NOT_FOUND', + domain: 'STORE', }; - const workingSiteMissing = getUserWorkingSiteMissing({ + const sitePresent = getUserSitePresent({ + user: {data}, + } as State); + expect(sitePresent).toEqual(false); + }); + + it('handles store user with siteId', () => { + const data = { + userId: 'swalton3', + siteId: '100', + workingSite: 'NOT_FOUND', + domain: 'STORE', + }; + const sitePresent = getUserSitePresent({ + user: {data}, + } as State); + expect(sitePresent).toEqual(true); + }); + + it('handles null user', () => { + const data = null; + const sitePresent = getUserSitePresent({ user: {data}, } as State); - expect(workingSiteMissing).toEqual(true); + expect(sitePresent).toEqual(false); }); }); --- src/redux/UserSelector.ts @@ -143,25 +143,14 @@ export const getUserSite = createSelector( workingSiteDomain ? workingSite : siteId, ); -export const getUserWorkingSiteMissing = createSelector( - [getIsWorkingSiteDomain, getUserWorkingSitePresent], - (workingSiteDomain, workingSitePresent) => - workingSiteDomain && !workingSitePresent, +export const getUserSitePresent = createSelector( + [getUserSite], + userValueDefinedSelector, ); export const getShouldPromptForSite = createSelector( - [getUserSiteIdPresent, getUserWorkingSiteMissing, getIsPreHire], - (siteIdPresent, missingWorkingSite, preHire) => { - if (preHire) { - return false; - } - - if (!siteIdPresent || missingWorkingSite) { - return true; - } else { - return false; - } - }, + [getUserSitePresent, getIsPreHire], + (sitePresent, preHire) => !preHire && !sitePresent, ); export const getShouldHideSplashOnAuth = createSelector(
Updating user selectors
Updating user selectors
e8f924e71a7f207ca197cb5933f4f3511beec36f
--- android/app/build.gradle @@ -158,8 +158,8 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 901 - versionName "1.8.15" + versionCode 902 + versionName "1.8.16" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { // We configure the CMake build only if you decide to opt-in for the New Architecture. --- ios/AllSpark/Info.plist @@ -19,7 +19,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.8.15</string> + <string>1.8.16</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -36,7 +36,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>901</string> + <string>902</string> <key>FirebaseAutomaticScreenReportingEnabled</key> <false /> <key>LSApplicationQueriesSchemes</key> --- package-lock.json @@ -1,12 +1,12 @@ { "name": "allspark-main", - "version": "1.8.15", + "version": "1.8.16", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "allspark-main", - "version": "1.8.15", + "version": "1.8.16", "hasInstallScript": true, "dependencies": { "@react-native-community/art": "^1.2.0", @@ -35,7 +35,7 @@ "@walmart/allspark-neon-core": "0.1.31", "@walmart/amp-mini-app": "0.2.13", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.3.8", + "@walmart/ask-sam-mini-app": "1.3.41", "@walmart/attendance-mini-app": "0.33.0", "@walmart/config-components": "4.0.1", "@walmart/core-services": "~1.4.9", --- package.json @@ -1,6 +1,6 @@ { "name": "allspark-main", - "version": "1.8.15", + "version": "1.8.16", "private": true, "scripts": { "android": "react-native run-android", @@ -78,7 +78,7 @@ "@walmart/allspark-neon-core": "0.1.31", "@walmart/amp-mini-app": "0.2.13", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.3.8", + "@walmart/ask-sam-mini-app": "1.3.41", "@walmart/attendance-mini-app": "0.33.0", "@walmart/config-components": "4.0.1", "@walmart/core-services": "~1.4.9",
SMBLV-3006: Ask Sam hot fix for schedule date format
SMBLV-3006: Ask Sam hot fix for schedule date format
1f09407f6b9263e30cce348a9c37417b0d68e9bd
--- .looper.yml @@ -3,8 +3,6 @@ node: ((osx||stable_osx)&&!dualcore) tools: nodejs: - 12.22.0 - npm: - - 6.9.0 scheduling: concurrent
chore: update looper node version
chore: update looper node version
7a269eb0db36be526b2d16be0ace56fe84bc685a
--- package.json @@ -13,7 +13,7 @@ "private": true, "scripts": { "init": "npm i --workspaces", - "test": "jest --detectOpenHandles", + "test": "jest", "coverage": "jest --coverage", "lint": "npm run lint --workspaces --if-present", "lint:fix": "npm run lint:fix --workspaces --if-present",
resolving commit
resolving commit
5907681180ee4ebf70259203c030e67e0f5ff248
--- docs/docs/components/_category_.json @@ -1,8 +0,0 @@ -{ - "label": "Components", - "position": 4, - "link": { - "type": "generated-index", - "description": "Indepth documentation on allspark framework components" - } -} --- docs/docs/components/allspark foundation/_category_.json @@ -1,8 +0,0 @@ -{ - "label": "Allspark Foundation", - "position": 1, - "link": { - "type": "generated-index", - "description": "Indepth documentation on allspark foundation" - } -} --- docs/docs/components/allspark foundation/hub-intro.md @@ -1,8 +0,0 @@ ---- -sidebar_position: 1 -title: Introduction ---- - -# Introduction - -Coming soon \ No newline at end of file
Update the docs
Update the docs
0c116101a2dae2d5f36d64cc64cb6f1105134c32
--- scripts/updateAndroidProjectConfig.sh @@ -56,11 +56,11 @@ sed -i.bak -e "s/scheme=\"${BETA_PACKAGE}\"/scheme=\"${PACKAGE}\"/g" -e "s/schem BUILD_CONFIG="${PACKAGE}.BuildConfig" echo "Updating BuildConfig import to ${BUILD_CONFIG} in ${MAIN_APPLICATION}" # sed -i.bak "s/import ${BETA_BUILD_CONFIG};|import ${PROD_BUILD_CONFIG};/import ${BUILD_CONFIG};/" ${MAIN_APPLICATION} && rm ${MAIN_APPLICATION}.bak -sed -i.bak -e "s/import ${BETA_BUILD_CONFIG};/import ${BUILD_CONFIG};/g" -e "s/import ${PROD_BUILD_CONFIG};/import ${BUILD_CONFIG};/g" ${MAIN_APPLICATION} && rm ${MAIN_APPLICATION}.bak +sed -i.bak -e "s/import\ ${BETA_BUILD_CONFIG};/import\ ${BUILD_CONFIG};/g" -e "s/import\ ${PROD_BUILD_CONFIG};/import\ ${BUILD_CONFIG};/g" ${MAIN_APPLICATION} && rm ${MAIN_APPLICATION}.bak echo "Updating BuildConfig import to ${BUILD_CONFIG} in ${MAIN_ACTIVITY}" # sed -i.bak "s/import ${BETA_BUILD_CONFIG};|import ${PROD_BUILD_CONFIG};/import ${BUILD_CONFIG};/" ${MAIN_ACTIVITY} && rm ${MAIN_ACTIVITY}.bak -sed -i.bak -e "s/import ${BETA_BUILD_CONFIG};/import ${BUILD_CONFIG};/g" -e "s/import ${PROD_BUILD_CONFIG};/import ${BUILD_CONFIG};/g" ${MAIN_ACTIVITY} && rm ${MAIN_ACTIVITY}.bak +sed -i.bak -e "s/import\ ${BETA_BUILD_CONFIG};/import\ ${BUILD_CONFIG};/g" -e "s/import\ ${PROD_BUILD_CONFIG};/import\ ${BUILD_CONFIG};/g" ${MAIN_ACTIVITY} && rm ${MAIN_ACTIVITY}.bak echo "Updating CodePushDeploymentKey to ${CODE_PUSH_KEY} in ${STRINGS_XML}" # sed -i.bak "s/${DEV_CODE_PUSH_KEY}|${BETA_CODE_PUSH_KEY}|${PROD_CODE_PUSH_KEY}/${CODE_PUSH_KEY}/" ${STRINGS_XML} && rm ${STRINGS_XML}.bak @@ -68,7 +68,13 @@ sed -i.bak -e "s/${DEV_CODE_PUSH_KEY}/${CODE_PUSH_KEY}/g" -e "s/${BETA_CODE_PUSH echo "Updating Manifest path in react-native.config.js to ${RN_CONFIG_MANIFEST_PATH} in ${RN_CONFIG_JS}" # sed -i.bak "s/android: ${RN_CONFIG_PROD_APP_MANIFEST_PATH}|android: ${RN_CONFIG_DEV_BETA_APP_MANIFEST_PATH}/android: ${RN_CONFIG_MANIFEST_PATH}/" ${RN_CONFIG_JS} && rm ${RN_CONFIG_JS} -sed -i.bak -e "s/android: ${RN_CONFIG_PROD_APP_MANIFEST_PATH}/android: ${RN_CONFIG_MANIFEST_PATH}/g" -e "s/android: ${RN_CONFIG_DEV_BETA_APP_MANIFEST_PATH}/android: ${RN_CONFIG_MANIFEST_PATH}/g" ${RN_CONFIG_JS} && rm ${RN_CONFIG_JS}.bak +sed -i.bak -e "s/android:\ ${RN_CONFIG_PROD_APP_MANIFEST_PATH}/android:\ ${RN_CONFIG_MANIFEST_PATH}/g" -e "s/android:\ ${RN_CONFIG_DEV_BETA_APP_MANIFEST_PATH}/android:\ ${RN_CONFIG_MANIFEST_PATH}/g" ${RN_CONFIG_JS} && rm ${RN_CONFIG_JS}.bak echo "Printing ${MAIN_ACTIVITY}" -cat ${MAIN_ACTIVITY} \ No newline at end of file +cat ${MAIN_ACTIVITY} +echo "Printing ${MAIN_APPLICATION}" +cat ${MAIN_APPLICATION} +echo "Printing ${STRINGS_XML}" +cat ${STRINGS_XML} +echo "Printing ${RN_CONFIG_JS}" +cat ${RN_CONFIG_JS} \ No newline at end of file
Added fixes
Added fixes
b6b9c6f0fbb2698020e10d28db41fd78db3f36bd
--- package-lock.json @@ -63,7 +63,7 @@ "@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-485-977b45c", + "@walmart/inbox-mini-app": "0.90.0-485-4dc92e2", "@walmart/iteminfo-mini-app": "7.8.3", "@walmart/learning-mini-app": "18.0.3", "@walmart/manager-approvals-miniapp": "0.2.4", @@ -9149,9 +9149,9 @@ } }, "node_modules/@walmart/inbox-mini-app": { - "version": "0.90.0-485-977b45c", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.90.0-485-977b45c.tgz", - "integrity": "sha512-WEpogpDKqT/xdDihXWGatPSp1bFTJuBw3uO+wbeVnJ6qg7DYIm9McAyRsCslSeJvEO/0rOLWb56aToK56vmTzQ==", + "version": "0.90.0-485-4dc92e2", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.90.0-485-4dc92e2.tgz", + "integrity": "sha512-ViJTzS+xTOaKmE3FPjU9gTFNwWBCgSu7jHhLiKgkxhhguWzb7SIZujfoqyWjew39mO8Z7NqBAheN4bV7XxUyWQ==", "dependencies": { "@walmart/moment-walmart": "^1.0.4", "@walmart/walmart-fiscal-week": "^0.3.6" @@ -33450,9 +33450,9 @@ "integrity": "sha512-Iqe7kNS9WRhmDkaIr7/4GwAE3s0lPQ0vcRYkIwchFeT1NE/PC/FVU3DoiNX2pgq6mXkg09PhyYGxmOe5+9ggUA==" }, "@walmart/inbox-mini-app": { - "version": "0.90.0-485-977b45c", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.90.0-485-977b45c.tgz", - "integrity": "sha512-WEpogpDKqT/xdDihXWGatPSp1bFTJuBw3uO+wbeVnJ6qg7DYIm9McAyRsCslSeJvEO/0rOLWb56aToK56vmTzQ==", + "version": "0.90.0-485-4dc92e2", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.90.0-485-4dc92e2.tgz", + "integrity": "sha512-ViJTzS+xTOaKmE3FPjU9gTFNwWBCgSu7jHhLiKgkxhhguWzb7SIZujfoqyWjew39mO8Z7NqBAheN4bV7XxUyWQ==", "requires": { "@walmart/moment-walmart": "1.0.4", "@walmart/walmart-fiscal-week": "^0.3.6" --- package.json @@ -104,7 +104,7 @@ "@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-485-977b45c", + "@walmart/inbox-mini-app": "0.90.0-485-4dc92e2", "@walmart/iteminfo-mini-app": "7.8.3", "@walmart/learning-mini-app": "18.0.3", "@walmart/manager-approvals-miniapp": "0.2.4",
Inbox WmWeek issue fix
Inbox WmWeek issue fix
1bd9e0af79d65823fe62f96bbe43b1086c4ad26f
--- package.json @@ -90,7 +90,7 @@ "@walmart/exception-mini-app": "0.43.1", "@walmart/facilities-management-miniapp": "0.3.26", "@walmart/feedback-all-spark-miniapp": "0.9.0", - "@walmart/financial-wellbeing-feature-app": "1.0.58", + "@walmart/financial-wellbeing-feature-app": "1.0.59", "@walmart/functional-components": "2.0.6", "@walmart/gta-react-native-calendars": "0.0.15", "@walmart/gtp-shared-components": "1.8.17",
bumped financial-wellbeing-feature-app to 1.0.59
bumped financial-wellbeing-feature-app to 1.0.59
a3012b230612170b490201bea88b394d2fb18365
--- __tests__/screens/RosterDetails/StoreRosterDetailScreen.test.tsx @@ -69,13 +69,17 @@ describe('StoreRosterDetailScreen', () => { }); (useRosterDetailsQueries as jest.Mock).mockReturnValue({ - teamLoading: false, - currentTeamData: {teamName: 'Team A'}, - teamError: null, - rosterLoading: false, - rosterData: {getDailyRoster: []}, - rosterError: null, - refetchRoster: jest.fn(), + storeTeamQuery: { + teamLoading: false, + currentTeamData: {teamName: 'Team A'}, + teamError: null, + }, + dailyRosterQuery: { + rosterLoading: false, + rosterData: {getDailyRoster: []}, + rosterError: null, + refetchRoster: jest.fn(), + }, allTeamsData: {getTeamsByStore: []}, onRefresh: jest.fn(), refreshState: {refreshing: false, lastRefresh: 'Today at 10 AM'}, @@ -117,8 +121,8 @@ describe('StoreRosterDetailScreen', () => { ...useRosterDetailsQueries({ route: {} as RouteProp<RosterNavParamsMap, 'myTeam.rosterDetail'>, }), - teamError: true, - rosterError: true, + storeTeamQuery: {teamError: true}, + dailyRosterQuery: {rosterError: true}, }); renderWithProviders( <StoreRosterDetailScreen --- __tests__/screens/RosterDetails/useRosterDetailsQueries.test.ts @@ -5,6 +5,9 @@ import { useGetTeamById, useDailyRoster, useGetTeamsByStore, + useSupplyChainShifts, + useSupplyChainTeamById, + useSupplyChainTeamsByBusinessUnit, } from '../../../src/hooks'; import {logger} from '../../../src/common'; import {RouteProp} from '@react-navigation/native'; @@ -14,6 +17,9 @@ jest.mock('../../../src/hooks', () => ({ useGetTeamById: jest.fn(), useDailyRoster: jest.fn(), useGetTeamsByStore: jest.fn(), + useSupplyChainShifts: jest.fn(), + useSupplyChainTeamById: jest.fn(), + useSupplyChainTeamsByBusinessUnit: jest.fn(), })); jest.mock( @@ -45,6 +51,8 @@ describe('useRosterDetailsQueries', () => { catch: jest.fn(), })); + const mockRefetchShifts = jest.fn(); + beforeEach(() => { jest.clearAllMocks(); (useStoreRosterDetails as jest.Mock).mockReturnValue({ @@ -61,7 +69,21 @@ describe('useRosterDetailsQueries', () => { error: null, refetch: mockRefetchRoster, }); + (useSupplyChainShifts as jest.Mock).mockReturnValue({ + loading: false, + data: {}, + error: null, + refetch: mockRefetchShifts, + }); + (useSupplyChainTeamById as jest.Mock).mockReturnValue({ + loading: false, + data: {}, + error: false, + }); (useGetTeamsByStore as jest.Mock).mockReturnValue({data: {}}); + (useSupplyChainTeamsByBusinessUnit as jest.Mock).mockReturnValue({ + data: {}, + }); }); it('should initialize refreshState with default values', () => { @@ -145,10 +167,10 @@ describe('useRosterDetailsQueries', () => { }), ); - expect(result.current.teamLoading).toBe(false); - expect(result.current.rosterLoading).toBe(false); - expect(result.current.currentTeamData).toEqual({}); - expect(result.current.rosterData).toEqual({}); + expect(result.current.storeTeamQuery.teamLoading).toBe(false); + expect(result.current.dailyRosterQuery.rosterLoading).toBe(false); + expect(result.current.storeTeamQuery.currentTeamData).toEqual({}); + expect(result.current.dailyRosterQuery.rosterData).toEqual({}); expect(result.current.allTeamsData).toEqual({}); }); @@ -165,7 +187,7 @@ describe('useRosterDetailsQueries', () => { }), ); - expect(result.current.teamLoading).toBe(true); + expect(result.current.storeTeamQuery.teamLoading).toBe(true); }); it('should update rosterLoading when roster data is loading', () => { @@ -182,7 +204,7 @@ describe('useRosterDetailsQueries', () => { }), ); - expect(result.current.rosterLoading).toBe(true); + expect(result.current.dailyRosterQuery.rosterLoading).toBe(true); }); it('should call refetchRoster on refresh', async () => { --- src/screens/RosterDetailScreen/StoreRosterDetailScreen/StoreRosterDetailScreen.tsx @@ -70,17 +70,15 @@ export const StoreRosterDetailScreen = ({route}: RosterDetailScreenProps) => { t, } = useStoreRosterDetails({route}); const { - teamLoading, - currentTeamData, - teamError, - rosterLoading, - rosterData, - rosterError, - refetchRoster, + storeTeamQuery, + dailyRosterQuery, allTeamsData, onRefresh, refreshState, } = useRosterDetailsQueries({route}); + const {teamLoading, teamError, currentTeamData} = storeTeamQuery; + const {rosterData, rosterError, rosterLoading, refetchRoster} = + dailyRosterQuery; const {bottom: bottomInset} = useSafeAreaInsets(); const navigation = useNavigation<StackNavigationProp<RosterNavParamsMap>>(); --- src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen/SupplyChainRosterDetailScreen.tsx @@ -59,20 +59,21 @@ export const SupplyChainRosterDetailScreen = ({ const { refreshState, onRefresh, - rosterData, - rosterLoading, - rosterError, - refetchRoster, - shiftsError, - shiftsLoading, - availableShifts, - refetchShifts, - SCteamLoading: teamLoading, - SCteamError: teamError, - SCcurrentTeamData: currentTeamData, + dailyRosterQuery, + shiftsQuery, + scTeamQuery, SCallTeamsData: allTeamsData, } = useRosterDetailsQueries({route}); + const {rosterData, rosterLoading, rosterError, refetchRoster} = + dailyRosterQuery; + const {shiftsError, shiftsLoading, availableShifts, refetchShifts} = + shiftsQuery; + const { + SCteamLoading: teamLoading, + SCteamError: teamError, + SCcurrentTeamData: currentTeamData, + } = scTeamQuery; const { t, setTeamState, --- src/screens/RosterDetailScreen/useRosterDetailsQueries.ts @@ -39,8 +39,6 @@ export const useRosterDetailsQueries = ({route}: RosterDetailScreenProps) => { refetch: refetchRoster, } = useDailyRoster(); - const {data: allTeamsData} = useGetTeamsByStore(); - const { loading: shiftsLoading, data: availableShifts, @@ -54,6 +52,21 @@ export const useRosterDetailsQueries = ({route}: RosterDetailScreenProps) => { error: SCteamError, } = useSupplyChainTeamById(teamState.teamIds?.[0]); + const {data: allTeamsData} = useGetTeamsByStore(); + const scTeamQuery = {SCteamLoading, SCcurrentTeamData, SCteamError}; + const storeTeamQuery = {teamLoading, currentTeamData, teamError}; + const dailyRosterQuery = { + rosterLoading, + rosterData, + rosterError, + refetchRoster, + }; + const shiftsQuery = { + shiftsLoading, + availableShifts, + shiftsError, + refetchShifts, + }; const {data: SCallTeamsData} = useSupplyChainTeamsByBusinessUnit(); // Hooks @@ -85,23 +98,13 @@ export const useRosterDetailsQueries = ({route}: RosterDetailScreenProps) => { }, [refreshState.refreshing]); return { - teamLoading, - currentTeamData, - teamError, - rosterLoading, - rosterData, - rosterError, - refetchRoster, - allTeamsData, onRefresh, refreshState, - shiftsError, - shiftsLoading, - availableShifts, - refetchShifts, - SCcurrentTeamData, - SCteamError, - SCteamLoading, + storeTeamQuery, + dailyRosterQuery, + allTeamsData, + shiftsQuery, + scTeamQuery, SCallTeamsData, }; };
refactor useRosterDetailsQueries hook
refactor useRosterDetailsQueries hook
be281e366be593b0f5af6dd35e2fe7f04449b7f1
--- graphql.yml @@ -14,7 +14,7 @@ applications: hash: '1bf0ea2f4d34274e578989be9f4248e9c4710577fda9705f944edc6e4732a799' queryTemplate: 'packages/me-at-walmart-athena-queries/src/getAssociateById.graphql' tags: - - 'v2' + - 'v1' - name: 'getDailyRosterHome' hash: '3c492831585580bae535c3386ec48e90c2d1895450016f050653bd51ddf86c21' queryTemplate: 'packages/me-at-walmart-athena-queries/src/getDailyRosterHome.graphql' @@ -24,7 +24,7 @@ applications: hash: 'd01b42ead651f9981eac0bcc2320f5903dbeab8952bbefc93ddbb315d493c4b9' queryTemplate: 'packages/me-at-walmart-athena-queries/src/getLoggedInUser.graphql' tags: - - 'v2' + - 'v1' - name: 'getLoggedInUserFallback' hash: '05f728f0a3bdbd2b3777b29be65834c4abfb3d4fc858db0cd77febc2a396a7d4' queryTemplate: 'packages/me-at-walmart-athena-queries/src/getLoggedInUserFallback.graphql' @@ -36,7 +36,7 @@ applications: tags: - 'v1' - name: 'upsertAssociatePreference' - hash: '20df06b4061ffd8ab096b1950cead3d94d99eef6301cdadd0e71f500067665e4' + hash: '0b8aaf440c76d96528719ae6352764c50d286c0f2013888a69a927510161161c' queryTemplate: 'packages/me-at-walmart-athena-queries/src/updateAssociatePrivacyPreference.graphql' tags: - 'v1' @@ -46,7 +46,7 @@ applications: hash: '1bf0ea2f4d34274e578989be9f4248e9c4710577fda9705f944edc6e4732a799' queryTemplate: 'packages/me-at-walmart-athena-queries/src/getAssociateById.graphql' tags: - - 'v2' + - 'v1' - name: 'getDailyRosterHome' hash: '3c492831585580bae535c3386ec48e90c2d1895450016f050653bd51ddf86c21' queryTemplate: 'packages/me-at-walmart-athena-queries/src/getDailyRosterHome.graphql' @@ -56,7 +56,7 @@ applications: hash: 'd01b42ead651f9981eac0bcc2320f5903dbeab8952bbefc93ddbb315d493c4b9' queryTemplate: 'packages/me-at-walmart-athena-queries/src/getLoggedInUser.graphql' tags: - - 'v2' + - 'v1' - name: 'getLoggedInUserFallback' hash: '05f728f0a3bdbd2b3777b29be65834c4abfb3d4fc858db0cd77febc2a396a7d4' queryTemplate: 'packages/me-at-walmart-athena-queries/src/getLoggedInUserFallback.graphql' @@ -68,7 +68,7 @@ applications: tags: - 'v1' - name: 'upsertAssociatePreference' - hash: '20df06b4061ffd8ab096b1950cead3d94d99eef6301cdadd0e71f500067665e4' + hash: '0b8aaf440c76d96528719ae6352764c50d286c0f2013888a69a927510161161c' queryTemplate: 'packages/me-at-walmart-athena-queries/src/updateAssociatePrivacyPreference.graphql' tags: - 'v1' --- packages/me-at-walmart-athena-queries/src/schema.graphql @@ -736,6 +736,15 @@ type AvailableEarningHours { hours: Float } +type AvgDayPay { + adpAmt: Float + chgTs: String + chgUserId: String + creatTs: String + creatUserId: String + id: Id +} + type BackroomReplenishmentGroupLocation implements SecondaryReplenishmentGroupLocation { countryCode: String! gtin: String @@ -1976,7 +1985,7 @@ type DocumentReference { } type DriverPayStubInfo { - avgDayPay: Float + avgDayPay: [AvgDayPay] driverWkAgg: [DriverWkAgg] driversEarningsWk1: [Earnings] driversEarningsWk2: [Earnings] --- packages/me-at-walmart-athena-queries/src/schema.types.ts @@ -666,6 +666,16 @@ export type AvailableEarningHours = { hours?: Maybe<Scalars['Float']>; }; +export type AvgDayPay = { + __typename?: 'AvgDayPay'; + adpAmt?: Maybe<Scalars['Float']>; + chgTs?: Maybe<Scalars['String']>; + chgUserId?: Maybe<Scalars['String']>; + creatTs?: Maybe<Scalars['String']>; + creatUserId?: Maybe<Scalars['String']>; + id?: Maybe<Id>; +}; + export type BackroomReplenishmentGroupLocation = SecondaryReplenishmentGroupLocation & { __typename?: 'BackroomReplenishmentGroupLocation'; countryCode: Scalars['String']; @@ -1801,7 +1811,7 @@ export type DocumentReference = { export type DriverPayStubInfo = { __typename?: 'DriverPayStubInfo'; - avgDayPay?: Maybe<Scalars['Float']>; + avgDayPay?: Maybe<Array<Maybe<AvgDayPay>>>; driverWkAgg?: Maybe<Array<Maybe<DriverWkAgg>>>; driversEarningsWk1?: Maybe<Array<Maybe<Earnings>>>; driversEarningsWk2?: Maybe<Array<Maybe<Earnings>>>; --- packages/me-at-walmart-athena-queries/src/updateAssociatePrivacyPreference.graphql @@ -8,5 +8,6 @@ mutation upsertAssociatePreference($associatePreferencesInput: AssociatePreferen birthday } } + walmartIdentificationNumber } } \ No newline at end of file --- packages/me-at-walmart-athena-queries/src/updateAssociatePrivacyPreference.ts @@ -12,6 +12,7 @@ export type UpsertAssociatePreferenceMutation = { __typename?: 'Mutation'; upsertAssociatePreference?: { __typename: 'AssociatePreferences'; + walmartIdentificationNumber: string; meAtWalmartPreferences?: { __typename: 'MeAtWalmartPreferences'; displayPreferences?: { @@ -37,6 +38,7 @@ export const UpsertAssociatePreferenceDocument = gql` birthday } } + walmartIdentificationNumber } } `;
feat(athena): update mutation.
feat(athena): update mutation.
6bf1cc4e09ae6892023ddf8c344f3ed977261ba7
--- package.json @@ -203,7 +203,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.18.0", + "react-native-gesture-handler": "~2.16.1", "react-native-get-random-values": "~1.11.0", "react-native-haptic-feedback": "^1.14.0", "react-native-html-parser": "^0.1.0", --- yarn.lock @@ -7138,7 +7138,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.18.0" + react-native-gesture-handler: "npm:~2.16.1" 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" @@ -18897,18 +18897,19 @@ __metadata: languageName: node linkType: hard -"react-native-gesture-handler@npm:~2.18.0": - version: 2.18.1 - resolution: "react-native-gesture-handler@npm:2.18.1" +"react-native-gesture-handler@npm:~2.16.1": + version: 2.16.2 + resolution: "react-native-gesture-handler@npm:2.16.2" dependencies: "@egjs/hammerjs": "npm:^2.0.17" hoist-non-react-statics: "npm:^3.3.0" invariant: "npm:^2.2.4" + lodash: "npm:^4.17.21" prop-types: "npm:^15.7.2" peerDependencies: react: "*" react-native: "*" - checksum: 10c0/6c0f69de1f31eb92cf858903223cbe37b5a71b9e943b70a284e564507067539c5381956b0f832a874da5e1185d01a0a56f06f11ea79985973235eaf3d469274b + checksum: 10c0/cd31794870edc51bc7051bf22893b19cebda5754c2fbd381f72e6ae6a718c26c5cf6966ad2f80e15e3a3217d09cc3e2e1637132f70bf44aacf62ea15a7636c98 languageName: node linkType: hard
fix: gesture handler library unaligned with expo recommendation
fix: gesture handler library unaligned with expo recommendation
53eb6633c59f5312dc6d1064e66ad39b6bb4ce37
--- core/__tests__/home/containers/CelebrationListScreenTest.tsx @@ -270,9 +270,10 @@ describe('CelebrationListScreen', () => { expect(renderLabel.props.children).toBe('birth day'); const mockRoute = {key: 'anniversary', title: 'Anniversary'}; const renderScene = renderTabBarScene.renderScene({route: mockRoute}); - expect(renderScene.props.title).toBe('Anniversary'); expect(renderScene.props.onScrollEndDrag()).toBe(undefined); + expect(renderScene.props.title).toBe('Anniversary'); expect(renderScene.props.onMomentumScrollEnd()).toBe(undefined); expect(renderScene.props.onMomentumScrollBegin()).toBe(undefined); + expect(renderScene.props.style.paddingTop).toBe(16); }); });
code cleanup
code cleanup
ebe46c2b2f4d00650055b937e3880a5e7172c056
--- 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.26](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.25.25...@walmart/allspark-foundation-hub@1.25.26) (2025-12-19) + +**Note:** Version bump only for package @walmart/allspark-foundation-hub + ## [1.25.25](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.25.24...@walmart/allspark-foundation-hub@1.25.25) (2025-12-19) **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.25", + "version": "1.25.26", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", --- packages/allspark-foundation/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. +## [7.17.6](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.17.5...@walmart/allspark-foundation@7.17.6) (2025-12-19) + +**Note:** Version bump only for package @walmart/allspark-foundation + ## [7.17.5](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.17.4...@walmart/allspark-foundation@7.17.5) (2025-12-19) **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.5", + "version": "7.17.6", "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.9.1](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/my-walmart-hub@1.9.0...@walmart/my-walmart-hub@1.9.1) (2025-12-19) + +**Note:** Version bump only for package @walmart/my-walmart-hub + # [1.9.0](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/my-walmart-hub@1.8.6...@walmart/my-walmart-hub@1.9.0) (2025-12-19) ### Features --- packages/my-walmart-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/my-walmart-hub", - "version": "1.9.0", + "version": "1.9.1", "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.6 - @walmart/allspark-foundation-hub@1.25.26 - @walmart/my-walmart-hub@1.9.1
775de52f9a2ddf1f4342b0b63cc1316bf2cb3277
--- packages/core-services/AppConfig/package.json @@ -0,0 +1,6 @@ +{ + "name": "@walmart/core-services/AppConfig", + "private": true, + "main": "./index", + "types": "./index" +} --- packages/core-services/Auth/package.json @@ -0,0 +1,6 @@ +{ + "name": "@walmart/core-services/Auth", + "private": true, + "main": "./index", + "types": "./index" +} --- packages/core-services/Environment/package.json @@ -0,0 +1,6 @@ +{ + "name": "@walmart/core-services/Environment", + "private": true, + "main": "./index", + "types": "./index" +} --- packages/core-services/HttpClient/package.json @@ -0,0 +1,6 @@ +{ + "name": "@walmart/core-services/HttpClient", + "private": true, + "main": "./index", + "types": "./index" +} --- packages/core-services/LocalStorage/package.json @@ -0,0 +1,6 @@ +{ + "name": "@walmart/core-services/LocalStorage", + "private": true, + "main": "./index", + "types": "./index" +} --- packages/core-services/Logger/package.json @@ -0,0 +1,6 @@ +{ + "name": "@walmart/core-services/Logger", + "private": true, + "main": "./index", + "types": "./index" +} --- packages/core-services/Network/package.json @@ -0,0 +1,6 @@ +{ + "name": "@walmart/core-services/Network", + "private": true, + "main": "./index", + "types": "./index" +} --- packages/core-services/Notification/package.json @@ -0,0 +1,6 @@ +{ + "name": "@walmart/core-services/Notification", + "private": true, + "main": "./index", + "types": "./index" +} --- packages/core-services/Permissions/package.json @@ -0,0 +1,6 @@ +{ + "name": "@walmart/core-services/Permissions", + "private": true, + "main": "./index", + "types": "./index" +} --- packages/core-services/Scanner/package.json @@ -0,0 +1,6 @@ +{ + "name": "@walmart/core-services/Scanner", + "private": true, + "main": "./index", + "types": "./index" +} --- packages/core-services/StoreConfig/package.json @@ -0,0 +1,6 @@ +{ + "name": "@walmart/core-services/StoreConfig", + "private": true, + "main": "./index", + "types": "./index" +} --- packages/core-services/Telemetry/package.json @@ -0,0 +1,6 @@ +{ + "name": "@walmart/core-services/Telemetry", + "private": true, + "main": "./index", + "types": "./index" +} --- packages/core-services/Translations/package.json @@ -0,0 +1,6 @@ +{ + "name": "@walmart/core-services/Translations", + "private": true, + "main": "./index", + "types": "./index" +} --- packages/core-services/User/package.json @@ -0,0 +1,6 @@ +{ + "name": "@walmart/core-services/User", + "private": true, + "main": "./index", + "types": "./index" +}
Merge changes
Merge changes
5534e21109de8cba8256e876fb62c310deee7824
--- package-lock.json @@ -5577,9 +5577,9 @@ "integrity": "sha512-kgl3PpMJiM1hqhpEfLMIEHBdq+e6mKLPZNT3fmJIgO3RZYV3xcCrO2gIacJL3j+nr8DuDdw/FzeCGzKdKurniw==" }, "@walmart/inbox-mini-app": { - "version": "0.67.0", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.67.0.tgz", - "integrity": "sha512-/kojMX9VncZuJprShdYhU17umdeBUCJZ56aWUY+QPdBuq79Nzl/ELuWuM4tMsCubNibwlwFli/FShJxg365qaQ==", + "version": "0.68.0", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.68.0.tgz", + "integrity": "sha512-/7ZFXUHVx0yMX0JlWOAHexThruILq6iqUbHCapkJAXdOym2eNIOTuzWRdxQm6Z3ABAZIHqC2TQU7VO8nrlTDrA==", "requires": { "@walmart/walmart-fiscal-week": "^0.3.6" } --- package.json @@ -96,7 +96,7 @@ "@walmart/gtp-shared-components": "1.8.9", "@walmart/impersonation-mini-app": "1.2.0", "@walmart/ims-print-services-ui": "1.1.4", - "@walmart/inbox-mini-app": "0.67.0", + "@walmart/inbox-mini-app": "0.68.0", "@walmart/iteminfo-mini-app": "5.1.7", "@walmart/manager-approvals-miniapp": "0.1.1", "@walmart/me-field-mini-app": "1.1.30",
inbox update
inbox update
3e36b753b4fb911a16f82840af0a9c2c784b9ac5
--- core/src/navigation/USHallway/AssociateHallwayNav/Tabs/config.tsx @@ -129,14 +129,14 @@ export function renderTabBarLabel( // --- Tab Options --- // // For tabs whose route names don't match the name needed when creating options below const ROUTE_ICON_MAP = { - askSamTab: 'sidekick', //To change to sidekick once ui-components is updated + askSamTab: 'sidekick', myTeam: 'my-team', taskit: 'inactive-task', sidekick: 'inactive-task', } as Record<string, string>; const ROUTE_ICON_ACTIVE_MAP = { - askSamTab: 'sidekick', //To change to sidekick once ui-components is updated + askSamTab: 'sidekick', myTeam: 'team-filled', taskit: 'task-active', sidekick: 'task-active',
Removed comments
Removed comments
20e4832f36d77c0c8b7d6cf2a362dff384dbd3c4
--- package-lock.json @@ -51,7 +51,7 @@ "@walmart/functional-components": "2.0.6", "@walmart/gta-react-native-calendars": "0.0.15", "@walmart/gtp-shared-components": "1.8.17", - "@walmart/impersonation-mini-app": "1.2.0", + "@walmart/impersonation-mini-app": "1.4.0", "@walmart/ims-print-services-ui": "1.1.4", "@walmart/inbox-mini-app": "0.68.0", "@walmart/iteminfo-mini-app": "6.0.1", @@ -78,7 +78,7 @@ "@walmart/refrigeration-alarms-mini-app": "1.35.0", "@walmart/returns-mini-app": "0.6.0", "@walmart/schedule-mini-app": "0.27.0", - "@walmart/settings-mini-app": "1.10.0", + "@walmart/settings-mini-app": "1.11.0", "@walmart/shelfavailability-mini-app": "1.3.2", "@walmart/taskit-mini-app": "0.47.0", "@walmart/time-clock-mini-app": "0.30.0", @@ -154,7 +154,7 @@ "react-native-view-shot": "^3.4.0", "react-native-vision-camera": "^2.15.1", "react-native-webview": "^11.23.1", - "react-native-wm-app-review": "0.3.0", + "react-native-wm-app-review": "v0.4.0-rc.0", "react-native-wm-config": "0.1.1", "react-native-wm-network": "0.2.0", "react-native-wm-notification": "2.0.1", @@ -5033,7 +5033,9 @@ } }, "node_modules/@walmart/impersonation-mini-app": { - "version": "1.2.0", + "version": "1.4.0", + "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.4.0.tgz", + "integrity": "sha512-vOHw5n1Add02n7GazeXNpwaoZhnEEMZrEVPwey4kT/jRpuuBnv1w0XJZBIH/BgqtYSrqsH0zMB05YnSUP2ypaA==", "peerDependencies": { "@react-native-community/masked-view": ">=0.1.10", "@react-native-community/picker": ">=1.8.1", @@ -5826,7 +5828,9 @@ "license": "GPL-3.0-or-later" }, "node_modules/@walmart/settings-mini-app": { - "version": "1.10.0", + "version": "1.11.0", + "resolved": "https://npme.walmart.com/@walmart/settings-mini-app/-/settings-mini-app-1.11.0.tgz", + "integrity": "sha512-a9jtaa6Eo6W743723gsnYOAv2HEmIkSsS1whGlyp0muKexTXAiMeeW+HYELwN0czdnXhaevR2C90a+PHLztrxA==", "peerDependencies": { "@react-native-community/async-storage": ">=1.12.1", "@react-native-community/masked-view": ">=0.1.10", @@ -18020,7 +18024,9 @@ } }, "node_modules/react-native-wm-app-review": { - "version": "0.3.0", + "version": "0.4.0-rc.0", + "resolved": "https://npme.walmart.com/react-native-wm-app-review/-/react-native-wm-app-review-0.4.0-rc.0.tgz", + "integrity": "sha512-m+YcmRkrqNIRnV4459lyfdRzgEs0iG/wZR7VbSAKhdrL5bPoELkmPof0YKyC6+nVPIejFeaBtzRhYJuD/e3c1w==", "license": "MIT", "dependencies": { "@react-native-community/async-storage": "^1.11.0" @@ -24844,7 +24850,9 @@ } }, "@walmart/impersonation-mini-app": { - "version": "1.2.0" + "version": "1.4.0", + "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.4.0.tgz", + "integrity": "sha512-vOHw5n1Add02n7GazeXNpwaoZhnEEMZrEVPwey4kT/jRpuuBnv1w0XJZBIH/BgqtYSrqsH0zMB05YnSUP2ypaA==" }, "@walmart/ims-print-services-ui": { "version": "1.1.4" @@ -25056,7 +25064,9 @@ "version": "1.0.4" }, "@walmart/settings-mini-app": { - "version": "1.10.0" + "version": "1.11.0", + "resolved": "https://npme.walmart.com/@walmart/settings-mini-app/-/settings-mini-app-1.11.0.tgz", + "integrity": "sha512-a9jtaa6Eo6W743723gsnYOAv2HEmIkSsS1whGlyp0muKexTXAiMeeW+HYELwN0czdnXhaevR2C90a+PHLztrxA==" }, "@walmart/shelfavailability-mini-app": { "version": "1.3.2" @@ -32832,7 +32842,9 @@ } }, "react-native-wm-app-review": { - "version": "0.3.0", + "version": "0.4.0-rc.0", + "resolved": "https://npme.walmart.com/react-native-wm-app-review/-/react-native-wm-app-review-0.4.0-rc.0.tgz", + "integrity": "sha512-m+YcmRkrqNIRnV4459lyfdRzgEs0iG/wZR7VbSAKhdrL5bPoELkmPof0YKyC6+nVPIejFeaBtzRhYJuD/e3c1w==", "requires": { "@react-native-community/async-storage": "^1.11.0" } --- package.json @@ -94,7 +94,7 @@ "@walmart/functional-components": "2.0.6", "@walmart/gta-react-native-calendars": "0.0.15", "@walmart/gtp-shared-components": "1.8.17", - "@walmart/impersonation-mini-app": "1.2.0", + "@walmart/impersonation-mini-app": "1.4.0", "@walmart/ims-print-services-ui": "1.1.4", "@walmart/inbox-mini-app": "0.68.0", "@walmart/iteminfo-mini-app": "6.0.1", @@ -120,7 +120,7 @@ "@walmart/refrigeration-alarms-mini-app": "1.35.0", "@walmart/returns-mini-app": "0.6.0", "@walmart/schedule-mini-app": "0.27.0", - "@walmart/settings-mini-app": "1.10.0", + "@walmart/settings-mini-app": "1.11.0", "@walmart/shelfavailability-mini-app": "1.3.2", "@walmart/taskit-mini-app": "0.47.0", "@walmart/time-clock-mini-app": "0.30.0", @@ -196,7 +196,7 @@ "react-native-view-shot": "^3.4.0", "react-native-vision-camera": "^2.15.1", "react-native-webview": "^11.23.1", - "react-native-wm-app-review": "0.3.0", + "react-native-wm-app-review": "v0.4.0-rc.0", "react-native-wm-config": "0.1.1", "react-native-wm-network": "0.2.0", "react-native-wm-notification": "2.0.1",
upgrade miniapps version for RN70
upgrade miniapps version for RN70
300019a414b8627742821f6fcdee51640c55b19c
--- .looper.multibranch.yml @@ -24,7 +24,7 @@ envs: ANDROID_BASE_PATH: targets/US/android branches: - - spec: feature/drop24 + - spec: feature/drop24* triggers: - manual: name: Publish Packages (Pre-Release) --- targets/US/package.json @@ -82,7 +82,7 @@ "@walmart/allspark-http-client": "~6.3.20", "@walmart/allspark-neon-core": "0.1.31", "@walmart/allspark-utils": "6.5.0", - "@walmart/amp-mini-app": "1.1.80", + "@walmart/amp-mini-app": "1.1.88", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "patch:@walmart/ask-sam-mini-app@npm%3A1.23.5#~/.yarn/patches/@walmart-ask-sam-mini-app-npm-1.23.5-99c0a3589b.patch", "@walmart/associate-listening-mini-app": "1.2.2", --- yarn.lock @@ -5859,19 +5859,19 @@ __metadata: languageName: node linkType: hard -"@walmart/amp-mini-app@npm:1.1.80": - version: 1.1.80 - resolution: "@walmart/amp-mini-app@npm:1.1.80" +"@walmart/amp-mini-app@npm:1.1.88": + version: 1.1.88 + resolution: "@walmart/amp-mini-app@npm:1.1.88" peerDependencies: "@react-navigation/native": ^6.0.0 "@react-navigation/stack": ^6.1.0 - "@walmart/core-services": ^1.4.9 + "@walmart/allspark-foundation": "*" + "@walmart/core-services": 6.1.4 "@walmart/gtp-shared-components": ^2.0.9 - "@walmart/redux-store": ^3.1.3 + "@walmart/redux-store": 6.1.4 react: ^18.2.0 - react-native: ~0.70.5 - react-native-drop-shadow: ^1.0.0 - checksum: 10c0/bd22fb7ee955a06c6a48d7aa06daa96f1bdeb6fb9fdcdaa87654d78481205f0d3f5b3286a6a73ebfe993d3d0e280b4cace073844d7e02f076f45fbafe38e6e58 + react-native: ~0.73.7 + checksum: 10c0/5a6489ca4124fe864eae441ab3f8654579a00ccfaff05cb8c3856b3c3a83157da2f505cc9f3f654be42c5bb16f5864c0c538ac21be0e00b05587e08d489ade1b languageName: node linkType: hard @@ -7060,7 +7060,7 @@ __metadata: "@walmart/allspark-http-client": "npm:~6.3.20" "@walmart/allspark-neon-core": "npm:0.1.31" "@walmart/allspark-utils": "npm:6.5.0" - "@walmart/amp-mini-app": "npm:1.1.80" + "@walmart/amp-mini-app": "npm:1.1.88" "@walmart/ask-sam-chat-components": "npm:^0.2.7" "@walmart/ask-sam-mini-app": "patch:@walmart/ask-sam-mini-app@npm%3A1.23.5#~/.yarn/patches/@walmart-ask-sam-mini-app-npm-1.23.5-99c0a3589b.patch" "@walmart/associate-listening-mini-app": "npm:1.2.2"
AMP version update
AMP version update
110a28d4872735ee7faf1890cd2ca4cde5cf9b46
--- jest.config.js @@ -5,10 +5,10 @@ module.exports = { collectCoverageFrom: ['<rootDir>/src/**/*.{js,jsx,ts,tsx}'], coverageThreshold: { global: { - statements: 16.4, - branches: 7, - functions: 7.84, - lines: 16.98, + statements: 17.24, + branches: 6.87, + functions: 6.91, + lines: 18.07, }, }, transformIgnorePatterns: [ --- jest.config.js @@ -5,10 +5,10 @@ module.exports = { collectCoverageFrom: ['<rootDir>/src/**/*.{js,jsx,ts,tsx}'], coverageThreshold: { global: { - statements: 16.4, - branches: 7, - functions: 7.84, - lines: 16.98, + statements: 17.24, + branches: 6.87, + functions: 6.91, + lines: 18.07, }, }, transformIgnorePatterns: [
increasing test coverage
increasing test coverage
5d664470f9a153b06f8555dc317559f652e4aa99
--- core/src/core/syncDeviceLanguage.ts @@ -34,7 +34,13 @@ export const syncDeviceLanguage = async () => { } // Device language sometimes comes back with an _. We have a standard of having languages like en-US. - language = language.replace('_', '-'); + // Sometimes we also get region info after the en-US format. + language = language.replace('_', '-').substring(0, 5); + + // DEFAULT to en-US if we encounter a language thats not supported. + if (!AllsparkTranslationClient.getSupportedLanguages().includes(language)) { + language = 'en-US'; + } // Change language on translation client (i18n) const currentLanguage = AllsparkTranslationClient.language;
fix: sometimes device can return a language string with additional info. Fixing that and also defaulting to en-US
fix: sometimes device can return a language string with additional info. Fixing that and also defaulting to en-US
f04398c560eb28a31360f5b9b7b7d2c363d62d21
--- index.js @@ -8,10 +8,8 @@ import 'moment/locale/es'; import 'moment/locale/es-mx'; import {AppRegistry} from 'react-native'; -import {App} from './src'; +import {App, preRegister} from './src'; import {name as appName} from './app.json'; -// import {setupCalling} from '@walmart/calling-mini-app'; - -// setupCalling(); +preRegister(); AppRegistry.registerComponent(appName, () => App); --- src/appReview/sagas.ts @@ -14,6 +14,9 @@ export function* handleAppReviewPrompt() { const config: FeatureConfig = yield select( ConfigSelectors.getContainerConfig, ); - const appReviewConfig = config['app-review'] || DEFAULT_CONFIG; - yield call(onReview, appReviewConfig); + + if (!config.appReviewPromptDisabled) { + const appReviewConfig = config['app-review'] || DEFAULT_CONFIG; + yield call(onReview, appReviewConfig); + } } --- src/calling/CallingSagas.ts @@ -0,0 +1,21 @@ +import { + ConfigSelectors, + FeatureConfig, +} from '@walmart/allspark-foundation/Config'; +import { + callingAppOnboardingFlow, + callingPermissionSagas, +} from '@walmart/calling-mini-app'; +import {call, select} from 'redux-saga/effects'; + +export function* handleCallingOnboarding() { + const config: FeatureConfig = yield select( + ConfigSelectors.getContainerConfig, + ); + + yield callingPermissionSagas(); + + if (!config.callingOnboardingDisabled) { + yield call(callingAppOnboardingFlow); + } +} --- src/index.tsx @@ -8,6 +8,13 @@ import {EnvironmentType} from '@walmart/allspark-foundation/Environment'; import {RootStackNavigation} from './navigation'; import {ENV, ENV_OVERRIDES} from '../env'; +/** + * Any setup that needs to happen before the app is registered. + */ +export const preRegister = () => { + require('@walmart/calling-mini-app/dist/rootSetup/index').setupCalling(); +}; + /** * Setup as a class to access codepush status changes. */ --- src/navigation/AssociateHallwayNav/MainStackNav.tsx @@ -9,7 +9,7 @@ import {AmpNav} from '@walmart/amp-mini-app/dist/components/AmpNav'; import {AskSamMiniApp} from '@walmart/ask-sam-mini-app'; import AttendanceMiniApp from '@walmart/attendance-mini-app'; import {AVPNav, AVP_NAV_SCREEN_NAME} from '@walmart/avp-feature-app'; -// import {ConnectedCallingMiniApp} from '@walmart/calling-mini-app'; +import {ConnectedCallingMiniApp} from '@walmart/calling-mini-app'; import {EmergencyBannerScreen} from '@walmart/emergency-mini-app'; import {ExceptionMiniApp as PinpointMiniApp} from '@walmart/exception-mini-app'; import {FacilitiesMaintainanceStack} from '@walmart/facilities-management-miniapp'; @@ -328,13 +328,13 @@ export const MainStackNav = () => { gestureDirection: 'vertical', }} /> - {/* <MainStack.Screen + <MainStack.Screen name='ConnectedCalling' component={ConnectedCallingMiniApp} options={{ cardStyle: {backgroundColor: 'transparent'}, }} - /> */} + /> <MainStack.Screen name='me-field-mini-app' component={FieldLearningApp} --- src/startup/RootStartup.ts @@ -5,7 +5,6 @@ import firestore from '@react-native-firebase/firestore'; import {AllsparkReduxStore} from '@walmart/allspark-foundation/Redux'; import {useToggleState} from '@walmart/allspark-utils'; -// import {callingPermissionSagas} from '@walmart/calling-mini-app'; import {Logger} from '../core/Logger'; import {Telemetry} from '../core/Telemetry'; @@ -65,10 +64,6 @@ export const initRootFeatures = () => { const cleanupBiometrics = initBiometrics(); const cleanupUpdateCheck = initUpdateCheck(); const cleanTermsOfUse = initTermsOfUse(); - // TODO: Move this to calling feature - // const callingPermissionTask = AllsparkReduxStore.addSagas( - // callingPermissionSagas, - // ); const startupTask = AllsparkReduxStore.addSagas(appFlow); const deeplinkTask = AllsparkReduxStore.addSagas(deeplinkSagas); @@ -78,8 +73,6 @@ export const initRootFeatures = () => { cleanupBiometrics(); cleanupUpdateCheck(); cleanTermsOfUse(); - // cleanupPermissions(); - // callingPermissionTask.cancel(); deeplinkTask.cancel(); }; }; --- src/startup/StartupFlow.ts @@ -3,7 +3,6 @@ import { waitForAppConfigFetch, MeAtWalmartUserSelectors, } from '@walmart/me-at-walmart-common'; -// import {callingAppOnboardingFlow} from '@walmart/calling-mini-app'; import { UpdateCheckActionCreators, @@ -15,9 +14,10 @@ import {checkPreviousImpersonation} from '../impersonation/sagas'; import {handlePermissions} from '../permissions/PermissionsSaga'; import {handlePinCode} from '../PinAccess/PinCodeSagas'; import {WhastNewActionCreators, WhatsNewTypes} from '../whatsNew/WhatsNewRedux'; -import {checkAvailableSurveys} from '../survey/SurveySaga'; +import {handleSurveyPrompt} from '../survey/SurveySaga'; import {handleAppReviewPrompt} from '../appReview/sagas'; import {handleSiteIdPrompt} from './UserFlow'; +import {handleCallingOnboarding} from '../calling/CallingSagas'; export function* candidateStartupFlow() { // Terms of Use @@ -66,10 +66,10 @@ export function* associateStartupFlow() { yield call(handleAppReviewPrompt); // Check for available surveys - yield put(checkAvailableSurveys()); + yield call(handleSurveyPrompt); // Trigger calling app onboarding flow - // yield call(callingAppOnboardingFlow); + yield call(handleCallingOnboarding); } export function* startupFlow() { --- src/survey/SurveySaga.ts @@ -1,8 +1,19 @@ import {createSelector} from 'reselect'; -import {all, call, delay, select, take, takeLatest} from 'redux-saga/effects'; +import { + all, + call, + delay, + put, + select, + take, + takeLatest, +} from 'redux-saga/effects'; import {AuthActionTypes} from '@walmart/allspark-foundation/Auth'; -import {ConfigSelectors} from '@walmart/allspark-foundation/Config'; +import { + ConfigSelectors, + FeatureConfig, +} from '@walmart/allspark-foundation/Config'; import { ClockActionTypes, ClockSelectors, @@ -24,6 +35,16 @@ export const getSurveyDelayTime = createSelector( export const CHECK_AVAILABLE_SURVEYS = 'global/WATCH_FOR_SURVEY'; export const checkAvailableSurveys = () => ({type: CHECK_AVAILABLE_SURVEYS}); +export function* handleSurveyPrompt() { + const config: FeatureConfig = yield select( + ConfigSelectors.getContainerConfig, + ); + + if (!config.surveyPromptDisabled) { + yield put(checkAvailableSurveys()); + } +} + // want to run when // clocking in -> global/CLOCK_CHECK_SUCCESS, global/CLOCK_CHECK_FAILURE // clocking out -> global/CLOCK_CHECK_SUCCESS, global/CLOCK_CHECK_FAILURE
refactor: add config options to control startup prompts. add preregister method. calling integration
refactor: add config options to control startup prompts. add preregister method. calling integration
93005310ba6773424269ef7a327f81f2d307d523
--- packages/allspark-graphql-client/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.4.5](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-graphql-client@1.4.4...@walmart/allspark-graphql-client@1.4.5) (2023-04-14) + +**Note:** Version bump only for package @walmart/allspark-graphql-client + + + + + ## [1.4.4](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-graphql-client@1.4.3...@walmart/allspark-graphql-client@1.4.4) (2023-04-13) **Note:** Version bump only for package @walmart/allspark-graphql-client --- packages/allspark-graphql-client/package-lock.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-graphql-client", - "version": "1.4.4", + "version": "1.4.5", "lockfileVersion": 1, "requires": true, "dependencies": { --- packages/allspark-graphql-client/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-graphql-client", - "version": "1.4.4", + "version": "1.4.5", "description": "> TODO: description", "license": "ISC", "main": "lib/index.js", @@ -33,7 +33,7 @@ "dependencies": { "@apollo/client": "^3.7.3", "@lifeomic/axios-fetch": "3.0.1", - "@walmart/allspark-http-client": "^2.4.12", + "@walmart/allspark-http-client": "^2.4.13", "crypto-js": "~4.1.1", "graphql": "^16.6.0" }, --- packages/allspark-http-client/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. +## [2.4.13](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-http-client@2.4.12...@walmart/allspark-http-client@2.4.13) (2023-04-14) + +**Note:** Version bump only for package @walmart/allspark-http-client + + + + + ## [2.4.12](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-http-client@2.4.11...@walmart/allspark-http-client@2.4.12) (2023-04-13) --- packages/allspark-http-client/package-lock.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-http-client", - "version": "2.4.12", + "version": "2.4.13", "lockfileVersion": 2, "requires": true, "packages": { --- packages/allspark-http-client/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-http-client", - "version": "2.4.12", + "version": "2.4.13", "description": "", "author": "rlane1 <russell.lane@walmart.com>", "license": "ISC", --- packages/core-services-allspark/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.10.7](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-services-allspark@2.10.6...@walmart/core-services-allspark@2.10.7) (2023-04-14) + + +### Bug Fixes + +* add learning type policies ([34d4a72](https://gecgithub01.walmart.com/allspark/allspark-core-services/commit/34d4a7286805ba78037ae223d346810f5ef1fc1a)) + + + + + ## [2.10.6](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-services-allspark@2.10.5...@walmart/core-services-allspark@2.10.6) (2023-04-13) **Note:** Version bump only for package @walmart/core-services-allspark --- packages/core-services-allspark/package-lock.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services-allspark", - "version": "2.10.6", + "version": "2.10.7", "lockfileVersion": 1, "requires": true, "dependencies": { --- packages/core-services-allspark/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services-allspark", - "version": "2.10.6", + "version": "2.10.7", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -23,11 +23,11 @@ "author": "", "license": "ISC", "dependencies": { - "@walmart/allspark-graphql-client": "^1.4.4", - "@walmart/allspark-http-client": "^2.4.12", + "@walmart/allspark-graphql-client": "^1.4.5", + "@walmart/allspark-http-client": "^2.4.13", "@walmart/allspark-utils": "^1.5.2", - "@walmart/core-services": "^2.0.18", - "@walmart/me-at-walmart-athena-queries": "^1.3.5", + "@walmart/core-services": "^2.0.19", + "@walmart/me-at-walmart-athena-queries": "^1.3.6", "crypto-js": "~4.1.1", "jwt-decode": "^3.1.2", "luxon": "^2.4.0", --- packages/core-services/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. +## [2.0.19](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-services@2.0.18...@walmart/core-services@2.0.19) (2023-04-14) + +**Note:** Version bump only for package @walmart/core-services + + + + + ## [2.0.18](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-services@2.0.17...@walmart/core-services@2.0.18) (2023-04-13) **Note:** Version bump only for package @walmart/core-services --- packages/core-services/package-lock.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services", - "version": "2.0.18", + "version": "2.0.19", "lockfileVersion": 2, "requires": true, "packages": { --- packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services", - "version": "2.0.18", + "version": "2.0.19", "description": "", "main": "index.js", "types": "index.d.ts", @@ -19,7 +19,7 @@ "author": "", "license": "ISC", "dependencies": { - "@walmart/allspark-http-client": "^2.4.12", + "@walmart/allspark-http-client": "^2.4.13", "@walmart/allspark-utils": "^1.5.2", "@walmart/redux-store": "~3.1.4", "reduxsauce": "^1.2.1", --- packages/me-at-walmart-athena-queries/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.3.6](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-athena-queries@1.3.5...@walmart/me-at-walmart-athena-queries@1.3.6) (2023-04-14) + +**Note:** Version bump only for package @walmart/me-at-walmart-athena-queries + + + + + ## [1.3.5](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-athena-queries@1.3.4...@walmart/me-at-walmart-athena-queries@1.3.5) (2023-04-13) **Note:** Version bump only for package @walmart/me-at-walmart-athena-queries --- packages/me-at-walmart-athena-queries/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart-athena-queries", - "version": "1.3.5", + "version": "1.3.6", "description": "> TODO: description", "author": "rlane1 <russell.lane@walmart.com>", "homepage": "", @@ -26,6 +26,6 @@ "clean": "rm -rf lib/ || true" }, "dependencies": { - "@walmart/allspark-graphql-client": "^1.4.4" + "@walmart/allspark-graphql-client": "^1.4.5" } }
chore(version): updating package version
chore(version): updating package version - @walmart/allspark-graphql-client@1.4.5 - @walmart/allspark-http-client@2.4.13 - @walmart/core-services@2.0.19 - @walmart/core-services-allspark@2.10.7 - @walmart/me-at-walmart-athena-queries@1.3.6
cc06dab8efed55fca653392eb923b8d661c6634f
--- packages/core-services-allspark/src/network/sagas.ts @@ -37,7 +37,10 @@ export function* onNetworkStateChanged( // Check connection type on each network state change, as long as internet is reachable if (nextState.isInternetReachable) { - nextConnectionType = yield call(getConnectionType, this.env.internalUrl); + nextConnectionType = yield call( + getConnectionType, + this.env.internalTestUrl + ); // If changed, add field to changed fields state if (nextConnectionType !== currentState.connectionType) { --- packages/core-services-allspark/src/types/index.ts @@ -31,6 +31,7 @@ export type IAllsparkEnvConfig = EnvConfig & { deployment: 'dev' | 'teflon' | 'stage' | 'prod' | 'beta'; appConsumerId: string; consumerId: string; + internalTestUrl: string; internalUrl: string; externalUrl: string; bffService: string;
fix: add new env config for test url used for connection type
fix: add new env config for test url used for connection type
02af457788123cdfe077e5198b95be8da8390e08
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "3.6.0-beta.6", + "version": "3.6.0-beta.7", "main": "dist/index.js", "files": [ "dist", @@ -92,7 +92,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.8.0-beta.7", + "@walmart/roster-mini-app": "3.8.0-beta.8", "@walmart/ui-components": "1.15.1", "@walmart/wmconnect-mini-app": "3.7.0-beta.4", "babel-jest": "^29.6.3", --- yarn.lock @@ -8034,7 +8034,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.8.0-beta.7" + "@walmart/roster-mini-app": "npm:3.8.0-beta.8" "@walmart/ui-components": "npm:1.15.1" "@walmart/wmconnect-mini-app": "npm:3.7.0-beta.4" babel-jest: "npm:^29.6.3" @@ -8144,9 +8144,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:3.8.0-beta.7": - version: 3.8.0-beta.7 - resolution: "@walmart/roster-mini-app@npm:3.8.0-beta.7::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-3.8.0-beta.7.tgz" +"@walmart/roster-mini-app@npm:3.8.0-beta.8": + version: 3.8.0-beta.8 + resolution: "@walmart/roster-mini-app@npm:3.8.0-beta.8::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-3.8.0-beta.8.tgz" dependencies: expo: "npm:~52.0.46" react: "npm:18.3.1" @@ -8162,7 +8162,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/6593c3ab98a2b9fd0acd29839a38db0e2086116cc35d52ad6c8f992a880d77dfc5ec7070843ffa646e64d6443a5a01c4da8f5a631b468c38e77d81530b99eb4a + checksum: 10c0/8f01efb40e44470f39813e66e9b1ca4a6412237cec6847ee2de119f62f8148b799c538986cad96994229a353b31fef895078a1f15e8cc3d08a0e04cef63a92b5 languageName: node linkType: hard
fix: update packages and tests
fix: update packages and tests
ff43ef65648aff669d155057be01cfe51446dd4f
--- package-lock.json @@ -4258,9 +4258,9 @@ "integrity": "sha512-rsHtoIJTGpR2zLro+B2r94psuK7G83J0XsUoerXiTAhRNDK/Si+oQiGI+xliq7bKRatUlbl6FrzblsILjofyGw==" }, "@walmart/inbox-mini-app": { - "version": "0.26.0-beta.4", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.26.0-beta.4.tgz", - "integrity": "sha512-SUWy8/z8lqga08l8UETiPzARnypabFTNLQo6WvUQVGEsSb+pqvgmRLNbbpgCZwG0qU6myr+bWYavGZznRfSyAA==" + "version": "0.26.0-beta.7", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.26.0-beta.7.tgz", + "integrity": "sha512-ocSbQuKdRq7We34HsQ2SaCxA942HnyNqNH27lOGDeXwXLe1m5kjQiFWYA8WQXA2yC/Qgwz1oQDtQ/LzEs/1pNg==" }, "@walmart/iteminfo-mini-app": { "version": "4.0.15", --- package.json @@ -84,7 +84,7 @@ "@walmart/gtp-shared-components": "1.2.0", "@walmart/impersonation-mini-app": "1.0.27", "@walmart/ims-print-services-ui": "0.1.16", - "@walmart/inbox-mini-app": "0.26.0-beta.4", + "@walmart/inbox-mini-app": "0.26.0-beta.7", "@walmart/iteminfo-mini-app": "4.0.15", "@walmart/manager-approvals-miniapp": "0.0.59", "@walmart/metrics-mini-app": "0.5.21",
version bump
version bump
5bf8f5369a089909cd3ff8405eea54874c702a41
--- packages/allspark-foundation/__tests__/Components/DynamicComponents.test.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { render } from '@testing-library/react-native'; +import { render, shallow } from '@testing-library/react-native'; import { DynamicComponent, AllsparkDynamicComponents } from '../../src/Components/DynamicComponents'; import { Text } from 'react-native'; @@ -9,23 +9,34 @@ describe('DynamicComponent', () => { beforeEach(() => { component = new DynamicComponent(MockTemplate); }); - it('should update a record', () => { - component.add('record-1', { value: 'Hello World' }); - component.update('record-1', { value: 'Hello World Updated' }); - const {getByText} = render(<component.Record id="record-1" />); - expect(getByText('Hello World Updated')).toBeTruthy(); - }); - it('should remove a record', () => { - component.add('record-1', { value: 'Hello World' }); - component.remove('record-1'); - const {queryByText} = render(<component.Record id="record-1" />); - expect(queryByText('Hello World')).toBeNull(); - }); it('should render a list of records', () => { component.add('record-1', { value: 'Hello World' }); const {getByText} = render(<component.List limit={2} method="lifo" />); expect(getByText('Hello World')).toBeTruthy(); }); + it('should update the existing record when calling add with an existing id', () => { + component.add('record-1', { value: 'First Value' }); + component.add('record-1', { value: 'Updated Value' }); + const { getByText } = render(<component.Record id="record-1" />); + expect(getByText('Updated Value')).toBeTruthy(); + }); + it('testing getRecord method', () => { + const { Component, update, clear } = component.getRecord('record-1', { value: 'Initial Value' }); + const { getByText, queryByText } = render(<Component />); + expect(getByText('Initial Value')).toBeTruthy(); + update({ value: 'Updated Value' }); + const { rerender } = render(<Component />); + rerender(<Component />); + expect(getByText('Updated Value')).toBeTruthy(); + clear(); + rerender(<Component />); + expect(queryByText('Updated Value')).toBeNull(); + }); + it('should add a new record when calling update with a non-existent id', () => { + component.update('record-2', { value: 'New Value' }); + const { getByText } = render(<component.Record id="record-2" />); + expect(getByText('New Value')).toBeTruthy(); + }); }); describe('AllsparkDynamicComponents', () => { @@ -61,6 +72,40 @@ describe('AllsparkDynamicComponents', () => { AllsparkDynamicComponents.getRecord('TestComponent', 'record-1', initialProps); expect(mockComponent.getRecord).toHaveBeenCalledWith('record-1', initialProps); }); + it('Render the Record component for the TestComponent', () => { + const props = { + component: 'TestComponent', + id: 'record-1', + }; + const { toJSON } = render(<AllsparkDynamicComponents.Record {...props} />); + expect(mockComponent.Record).toHaveBeenCalledWith({ id: 'record-1' }, {}); + expect(toJSON()).toMatchSnapshot(); + }); + it('Render the List component for the TestComponent', () => { + const props = { + component: 'TestComponent', + someProp: 'value', + }; + const { toJSON } = render(<AllsparkDynamicComponents.List {...props} />); + expect(mockComponent.List).toHaveBeenCalledWith( + { someProp: 'value' }, + {} + ); + expect(toJSON()).toMatchSnapshot(); + }); + it('Render the Template component for the TestComponent', () => { + const templateProps = { someTemplateProp: 'templateValue' }; + const props = { + component: 'TestComponent', + props: templateProps, + }; + const { toJSON } = render(<AllsparkDynamicComponents.Template {...props} />); + expect(mockComponent.Template).toHaveBeenCalledWith( + { id: 'template', ...templateProps }, + {} + ); + expect(toJSON()).toMatchSnapshot(); + }); });
more unit test for dynamic component
more unit test for dynamic component
da67e07c5be14e29cd7563ac7f60377e062c9788
--- .looper.multibranch.yml @@ -65,29 +65,28 @@ branches: call: push(simulator) flows: - prepare-npm-project: + yarnInstall: - (name Yarn Install) corepack enable - (name Yarn Version) yarn --version - (name Install Dependencies) yarn install + + preparePackages: + - call: yarnInstall + - (name Build Packages) yarn run build + + prepare-npm-project: + - call: preparePackages - (name Set NPM Env) yarn run env:dev app-build-init: - call: initialize - - (name Yarn Install) corepack enable - - (name Yarn Version) yarn --version - - (name Install Dependencies) yarn install + - call: yarnInstall - if: ${MULTI_BUILD} then: - call: set-build-number else: - call: incremental-build-number - preparePackages: - - (name Yarn Install) corepack enable - - (name Yarn Version) yarn --version - - (name Install Dependencies) yarn install - - (name Build Packages) yarn run build - publishFromChanges: - call: preparePackages - (name Publish From Changes) HUSKY_SKIP_HOOKS=1 npx lerna publish --yes
chore: testing looper changes
chore: testing looper changes
a2a2fd509adbda42f97b313e203a4d257a9ba070
--- ios/Podfile.lock @@ -427,7 +427,7 @@ PODS: - React - react-native-safe-area-context (3.3.2): - React-Core - - react-native-scanner-3.0 (0.1.15): + - react-native-scanner-3.0 (0.1.16): - Firebase/Analytics - React - ScanditBarcodeCapture (= 6.14.0) @@ -1005,7 +1005,7 @@ SPEC CHECKSUMS: react-native-pdf: 33c622cbdf776a649929e8b9d1ce2d313347c4fa react-native-ptt-module: 03c55e2666382002ce515ab08941d81987a4b2e1 react-native-safe-area-context: 5cf05f49df9d17261e40e518481f2e334c6cd4b5 - react-native-scanner-3.0: d45f6d7789b954dee57793314c96c683b842d3b8 + react-native-scanner-3.0: 0f07110a0ed542ef7f9b5583a5648653c04e4ec4 react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865 react-native-video: 8d97379f3c2322a569f1e27542ad1a646cad9444 react-native-view-shot: 08c46c9e8e92f6681e8f2ffa55ac3d06e7e99070 --- package-lock.json @@ -5480,9 +5480,9 @@ "integrity": "sha512-qxVserzdiG4xsZCLRIwYfRq/KuHsYSPkrl02tKHNhF5bhtWWo6oEUatBoSsY5BL8EVGOHk2ezsPWb2o5pg9Ryw==" }, "@walmart/react-native-scanner-3.0": { - "version": "0.1.15", - "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.1.15.tgz", - "integrity": "sha512-srtC0cSl+1oraWAjVgUh9FvZ9zntW2yfPLpAiy3/nmNwgJimVy706z4tbPEMNSKPrwkfeyqcvyuJQISo0D148w==" + "version": "0.1.16", + "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.1.16.tgz", + "integrity": "sha512-/GM5/K7YbX4lFM2+9oWsfXJHjociqSz4yIZIjo3FhBGbQ14NHXi6m1zIyYO3gk5VKWShiW66QckBfedpqO8mgQ==" }, "@walmart/react-native-shared-navigation": { "version": "1.0.2", --- package.json @@ -110,7 +110,7 @@ "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "^0.2.0", "@walmart/react-native-logger": "^1.29.0", - "@walmart/react-native-scanner-3.0": "0.1.15", + "@walmart/react-native-scanner-3.0": "0.1.16", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "^0.3.7", "@walmart/react-native-sumo-sdk": "2.2.2-beta.2",
Scanner3: Remove wakelock from scanner3 android
Scanner3: Remove wakelock from scanner3 android
c1287512becfe1b98b526fa3a05aa2f41d93cb1c
--- __tests__/__mocks__/@walmart/topstock-mini-app.js --- package-lock.json @@ -81,8 +81,8 @@ "@walmart/shelfavailability-mini-app": "1.5.13", "@walmart/taskit-mini-app": "2.24.5", "@walmart/time-clock-mini-app": "2.49.0", + "@walmart/topstock-mini-app": "0.0.2", "@walmart/ui-components": "1.10.1", - "@walmart/vizpick-mini-app": "0.44.29", "@walmart/welcomeme-mini-app": "0.76.0", "@walmart/wfm-ui": "0.2.26", "axios": "~1.2.6", @@ -6098,6 +6098,32 @@ "version": "1.0.4", "license": "GPL-3.0-or-later" }, + "node_modules/@walmart/topstock-mini-app": { + "version": "0.0.2", + "resolved": "https://npme.walmart.com/@walmart/topstock-mini-app/-/topstock-mini-app-0.0.2.tgz", + "integrity": "sha512-ZaZuQZ3zCn1J0vJt5pA34+JH5e4H5AmZEdA3kvJFiAnQFhaZ2dRjM332+y0rD/AwPn+lH5SS4q12UYS6hXJUpA==", + "dependencies": { + "javascript-time-ago": "^2.5.7" + }, + "peerDependencies": { + "@react-native-firebase/app": "^15.1.1", + "@react-native-firebase/crashlytics": "^15.1.1", + "@react-navigation/native": ">=5.8.10", + "@react-navigation/stack": ">=5.12.8", + "@walmart/core-services": "~2.0.11", + "@walmart/core-services-allspark": "~2.8.4", + "@walmart/gtp-shared-components": ">=2.0.3", + "@walmart/react-native-env": ">=0.1.0", + "@walmart/redux-store": ">=1.0.10", + "@walmart/ui-components": ">=1.0.79", + "i18next": ">=19.5.1", + "react-i18next": ">=11.7.3", + "react-native-haptic-feedback": "^1.13.0", + "react-native-vector-icons": ">=6.6.0", + "react-native-wm-vizpick-shell": ">=0.26.5", + "react-redux": ">=7.2.0" + } + }, "node_modules/@walmart/ui-components": { "version": "1.10.1", "license": "ISC", @@ -6125,30 +6151,6 @@ "lodash": "^4.17.15" } }, - "node_modules/@walmart/vizpick-mini-app": { - "version": "0.44.29", - "dependencies": { - "javascript-time-ago": "^2.5.7" - }, - "peerDependencies": { - "@react-native-firebase/app": "^15.1.1", - "@react-native-firebase/crashlytics": "^15.1.1", - "@react-navigation/native": ">=5.8.10", - "@react-navigation/stack": ">=5.12.8", - "@walmart/core-services": "~2.0.11", - "@walmart/core-services-allspark": "~2.8.4", - "@walmart/gtp-shared-components": ">=2.0.3", - "@walmart/react-native-env": ">=0.1.0", - "@walmart/redux-store": ">=1.0.10", - "@walmart/ui-components": ">=1.0.79", - "i18next": ">=19.5.1", - "react-i18next": ">=11.7.3", - "react-native-haptic-feedback": "^1.13.0", - "react-native-vector-icons": ">=6.6.0", - "react-native-wm-vizpick-shell": ">=0.26.5", - "react-redux": ">=7.2.0" - } - }, "node_modules/@walmart/walmart-fiscal-week": { "version": "0.3.6", "license": "ISC", @@ -25399,6 +25401,14 @@ "@walmart/timeamount": { "version": "1.0.4" }, + "@walmart/topstock-mini-app": { + "version": "0.0.2", + "resolved": "https://npme.walmart.com/@walmart/topstock-mini-app/-/topstock-mini-app-0.0.2.tgz", + "integrity": "sha512-ZaZuQZ3zCn1J0vJt5pA34+JH5e4H5AmZEdA3kvJFiAnQFhaZ2dRjM332+y0rD/AwPn+lH5SS4q12UYS6hXJUpA==", + "requires": { + "javascript-time-ago": "^2.5.7" + } + }, "@walmart/ui-components": { "version": "1.10.1", "requires": { @@ -25414,12 +25424,6 @@ "lodash": "^4.17.15" } }, - "@walmart/vizpick-mini-app": { - "version": "0.44.29", - "requires": { - "javascript-time-ago": "^2.5.7" - } - }, "@walmart/walmart-fiscal-week": { "version": "0.3.6", "requires": { --- package.json @@ -123,8 +123,8 @@ "@walmart/shelfavailability-mini-app": "1.5.13", "@walmart/taskit-mini-app": "2.24.5", "@walmart/time-clock-mini-app": "2.49.0", + "@walmart/topstock-mini-app": "0.0.2", "@walmart/ui-components": "1.10.1", - "@walmart/vizpick-mini-app": "0.44.29", "@walmart/welcomeme-mini-app": "0.76.0", "@walmart/wfm-ui": "0.2.26", "axios": "~1.2.6", --- src/navigation/AssociateHallwayNav/MainStackNav.tsx @@ -64,7 +64,7 @@ import { import {PayStubMiniApp} from '@walmart/pay-stub-miniapp'; import {ReturnsMiniApp} from '@walmart/returns-mini-app'; import {EmergencyBannerScreen} from '@walmart/emergency-mini-app'; -import {TopstockMiniApp} from '@walmart/vizpick-mini-app'; +import {TopstockMiniApp} from '@walmart/topstock-mini-app'; //--- Main Stack --- // const MainStack = createStackNavigator(); --- src/translations/en-US.ts @@ -31,7 +31,7 @@ export const enUS_common = { '@walmart/shelfavailability-mini-app': 'Shelf Availability', '@walmart/taskit-mini-app': 'Notes', '@walmart/time-clock-mini-app': 'Time Clock', - '@walmart/vizpick-mini-app': 'Topstock', + '@walmart/topstock-mini-app': 'Topstock', '@walmart/welcomeme-mini-app': 'Welcome Me', core: 'Me@Walmart', 'react-native-ssmp-sso-allspark': 'Single Sign On', --- src/translations/es-MX.ts @@ -31,7 +31,7 @@ export const esMX_common = { '@walmart/shelfavailability-mini-app': 'Shelf Availability', '@walmart/taskit-mini-app': 'Notas', '@walmart/time-clock-mini-app': 'Time Clock', - '@walmart/vizpick-mini-app': 'Topstock', + '@walmart/topstock-mini-app': 'Topstock', '@walmart/welcomeme-mini-app': 'Welcome Me', core: 'Me@Walmart', 'react-native-ssmp-sso-allspark': 'Single Sign On', --- src/versions/constants.ts @@ -34,7 +34,7 @@ export const LISTED_DEPENDENCIES = [ '@walmart/shelfavailability-mini-app', '@walmart/taskit-mini-app', '@walmart/time-clock-mini-app', - '@walmart/vizpick-mini-app', + '@walmart/topstock-mini-app', '@walmart/welcomeme-mini-app', 'react-native-ssmp-sso-allspark', ];
rename package name
rename package name
2e394f53d25b808075baa265eab7ef9ad6c964fb
--- src/audio/context.ts @@ -0,0 +1,10 @@ +import {createContext} from 'react'; +import {noop} from 'lodash'; + +export const AudioPlayerContext = createContext<{ + currentPlaying: string | null; + setCurrentPlaying: (value: string) => void; +}>({ + currentPlaying: null, + setCurrentPlaying: noop, +}); --- src/audio/hooks.ts @@ -0,0 +1,4 @@ +import {useContext} from 'react'; +import {AudioPlayerContext} from './context'; + +export const useAudioPlayerContext = () => useContext(AudioPlayerContext); --- src/audio/index.ts @@ -0,0 +1,2 @@ +export * from './context'; +export * from './hooks'; --- src/channels/context.ts @@ -15,11 +15,3 @@ export const ChannelsContext = createContext<IChannelsContext>({ export const PushToTalkContext = createContext<{}>({ // place holder }); - -export const AudioPlayerContext = createContext<{ - currentPlaying: string | null; - setCurrentPlaying: (value: string) => void; -}>({ - currentPlaying: null, - setCurrentPlaying: noop, -}); --- src/channels/hooks.ts @@ -1,6 +1,6 @@ /* eslint-disable react-hooks/exhaustive-deps */ import {useContext, useEffect, useMemo, useState} from 'react'; -import {AudioPlayerContext, ChannelsContext} from './context'; +import {ChannelsContext} from './context'; import {LocalFirebaseChannel, LastMessage} from './types'; import firestore from '@react-native-firebase/firestore'; import {useSelector} from 'react-redux'; @@ -14,8 +14,6 @@ import {useTextingFeatureEnabled} from '../hooks'; export const useChannelContext = () => useContext(ChannelsContext); -export const useAudioPlayerContext = () => useContext(AudioPlayerContext); - export const useChannelIds = () => { const channels = useChannelContext(); return channels.ids; --- src/containers/ChatInput/AudioPlayback.tsx @@ -14,7 +14,7 @@ import {MeteringPlayback} from './MeteringVisualization'; import {PlaybackDetails} from './types'; import {msToTimeStamp} from '../../utils'; import {logger} from '../../logger/Logger'; -import {useAudioPlayerContext} from '../../channels'; +import {useAudioPlayerContext} from '../../audio'; const styles = StyleSheet.create({ container: { --- src/screens/MessagesScreen.tsx @@ -46,7 +46,7 @@ import {messageTypes, SEVEN_DAYS_AGO_TIMESTAMP} from '../constants'; import {getNetworkState} from '@walmart/core-services/Network/selectors'; import {ErrorComponent} from '../components/ErrorComponent'; import {HttpClientError} from '@walmart/allspark-http-client'; -import {AudioPlayerContext} from '../channels/context'; +import {AudioPlayerContext} from '../audio/context'; const styles = StyleSheet.create({ container: { --- src/audio/context.ts @@ -0,0 +1,10 @@ +import {createContext} from 'react'; +import {noop} from 'lodash'; + +export const AudioPlayerContext = createContext<{ + currentPlaying: string | null; + setCurrentPlaying: (value: string) => void; +}>({ + currentPlaying: null, + setCurrentPlaying: noop, +}); --- src/audio/hooks.ts @@ -0,0 +1,4 @@ +import {useContext} from 'react'; +import {AudioPlayerContext} from './context'; + +export const useAudioPlayerContext = () => useContext(AudioPlayerContext); --- src/audio/index.ts @@ -0,0 +1,2 @@ +export * from './context'; +export * from './hooks'; --- src/channels/context.ts @@ -15,11 +15,3 @@ export const ChannelsContext = createContext<IChannelsContext>({ export const PushToTalkContext = createContext<{}>({ // place holder }); - -export const AudioPlayerContext = createContext<{ - currentPlaying: string | null; - setCurrentPlaying: (value: string) => void; -}>({ - currentPlaying: null, - setCurrentPlaying: noop, -}); --- src/channels/hooks.ts @@ -1,6 +1,6 @@ /* eslint-disable react-hooks/exhaustive-deps */ import {useContext, useEffect, useMemo, useState} from 'react'; -import {AudioPlayerContext, ChannelsContext} from './context'; +import {ChannelsContext} from './context'; import {LocalFirebaseChannel, LastMessage} from './types'; import firestore from '@react-native-firebase/firestore'; import {useSelector} from 'react-redux'; @@ -14,8 +14,6 @@ import {useTextingFeatureEnabled} from '../hooks'; export const useChannelContext = () => useContext(ChannelsContext); -export const useAudioPlayerContext = () => useContext(AudioPlayerContext); - export const useChannelIds = () => { const channels = useChannelContext(); return channels.ids; --- src/containers/ChatInput/AudioPlayback.tsx @@ -14,7 +14,7 @@ import {MeteringPlayback} from './MeteringVisualization'; import {PlaybackDetails} from './types'; import {msToTimeStamp} from '../../utils'; import {logger} from '../../logger/Logger'; -import {useAudioPlayerContext} from '../../channels'; +import {useAudioPlayerContext} from '../../audio'; const styles = StyleSheet.create({ container: { --- src/screens/MessagesScreen.tsx @@ -46,7 +46,7 @@ import {messageTypes, SEVEN_DAYS_AGO_TIMESTAMP} from '../constants'; import {getNetworkState} from '@walmart/core-services/Network/selectors'; import {ErrorComponent} from '../components/ErrorComponent'; import {HttpClientError} from '@walmart/allspark-http-client'; -import {AudioPlayerContext} from '../channels/context'; +import {AudioPlayerContext} from '../audio/context'; const styles = StyleSheet.create({ container: {
moving audio context to its own folder
moving audio context to its own folder
9740232f0eaed60f561325be0649689691460898
--- 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.0", - "@walmart/receipt-check-miniapp": "1.9.6", + "@walmart/receipt-check-miniapp": "1.9.7", "@walmart/redux-store": "3.1.3", "@walmart/refrigeration-alarms-mini-app": "1.35.0", "@walmart/returns-mini-app": "0.6.0", @@ -5849,9 +5849,9 @@ } }, "node_modules/@walmart/receipt-check-miniapp": { - "version": "1.9.6", - "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.9.6.tgz", - "integrity": "sha512-W8eCAHMW0leWfWf+mty2yNvSq9joNXVurGKWrf97ZWSJpYY28J2mYGuCB1QM07dFi2QSlw6Mx8YKF6RxDlen8w==", + "version": "1.9.7", + "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.9.7.tgz", + "integrity": "sha512-m2/d67HqnE2ASNfnOaiMwwhQpXxqtxfdJMfq9mPjzxD1eEbIdxjAcDvbT0Za4lBqEQGCVKYRgXg1VTRsmLyHMA==", "dependencies": { "@walmart/tcnumber": "^2.3.3", "@xstate/react": "^3.0.1", @@ -25370,9 +25370,9 @@ "integrity": "sha512-VkGT8BSZOsxR4FJjxeu6ursO3qzAVZea6jEwT6KJsXgBJ9MIHhkBo78guM6kEbqqQl3SlGS/+5tbOxKdWrvStQ==" }, "@walmart/receipt-check-miniapp": { - "version": "1.9.6", - "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.9.6.tgz", - "integrity": "sha512-W8eCAHMW0leWfWf+mty2yNvSq9joNXVurGKWrf97ZWSJpYY28J2mYGuCB1QM07dFi2QSlw6Mx8YKF6RxDlen8w==", + "version": "1.9.7", + "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.9.7.tgz", + "integrity": "sha512-m2/d67HqnE2ASNfnOaiMwwhQpXxqtxfdJMfq9mPjzxD1eEbIdxjAcDvbT0Za4lBqEQGCVKYRgXg1VTRsmLyHMA==", "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.0", - "@walmart/receipt-check-miniapp": "1.9.6", + "@walmart/receipt-check-miniapp": "1.9.7", "@walmart/redux-store": "3.1.3", "@walmart/refrigeration-alarms-mini-app": "1.35.0", "@walmart/returns-mini-app": "0.6.0",
bump version for minor fixes
bump version for minor fixes
e354dd977e164d6ba8c57425a6be302c9235bca5
--- src/navigation/AssociateHallwayNav/SideMenuContent.tsx @@ -94,7 +94,7 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps< StatusBar.setBarStyle('light-content', true); if (remoteNavConfig?.length && !navConfig) { // TODO: revert back to setNavConfig(remoteNavConfig); - setNavConfig([defaultConfig[0], ...remoteNavConfig]); + setNavConfig(defaultConfig); } } // eslint-disable-next-line react-hooks/exhaustive-deps
defaultconfig
defaultconfig
02844025260ffcac243f9c65ef97f11ceff89b6d
--- __tests__/components/DNDHeader.test.tsx @@ -15,9 +15,8 @@ describe('DNDHeader Component', () => { jest.restoreAllMocks(); }); it('should render correctly', () => { - const {getByText, getByTestId, toJSON} = renderWithProviders(<DNDHeader />); + const {getByTestId, toJSON} = renderWithProviders(<DNDHeader />); - expect(getByText('Do not disturb')).toBeTruthy(); expect(getByTestId('dndSwitch')).toBeTruthy(); expect(toJSON()).toMatchSnapshot(); }); @@ -38,8 +37,7 @@ describe('DNDHeader Component', () => { it('should handle when user is online', () => { (useDNDPreference as jest.Mock).mockReturnValue('online'); - const {getByText, getByTestId, toJSON} = renderWithProviders(<DNDHeader />); - expect(getByText('Do not disturb')).toBeTruthy(); + const {getByTestId, toJSON} = renderWithProviders(<DNDHeader />); expect(getByTestId('dndSwitch')).toBeTruthy(); expect(toJSON()).toMatchSnapshot(); }); --- __tests__/components/__snapshots__/DNDHeader.test.tsx.snap @@ -24,8 +24,8 @@ exports[`DNDHeader Component should display loading toggle when loading props is } > <Text - accessibilityLabel="Do not disturb" - accessibilityRole="header" + accessibilityElementsHidden={true} + importantForAccessibility="no-hide-descendants" style={ { "fontFamily": "Bogle-Regular", @@ -76,8 +76,8 @@ exports[`DNDHeader Component should handle when user is online 1`] = ` } > <Text - accessibilityLabel="Do not disturb" - accessibilityRole="header" + accessibilityElementsHidden={true} + importantForAccessibility="no-hide-descendants" style={ { "fontFamily": "Bogle-Regular", @@ -89,7 +89,7 @@ exports[`DNDHeader Component should handle when user is online 1`] = ` Do not disturb </Text> <View - accessibilityLabel="Do not disturb off" + accessibilityLabel="Do not disturb" accessibilityRole="switch" accessibilityState={ { @@ -105,7 +105,7 @@ exports[`DNDHeader Component should handle when user is online 1`] = ` "max": undefined, "min": undefined, "now": undefined, - "text": undefined, + "text": "off", } } accessible={true} @@ -194,8 +194,8 @@ exports[`DNDHeader Component should render correctly 1`] = ` } > <Text - accessibilityLabel="Do not disturb" - accessibilityRole="header" + accessibilityElementsHidden={true} + importantForAccessibility="no-hide-descendants" style={ { "fontFamily": "Bogle-Regular", @@ -207,7 +207,7 @@ exports[`DNDHeader Component should render correctly 1`] = ` Do not disturb </Text> <View - accessibilityLabel="Do not disturb off" + accessibilityLabel="Do not disturb" accessibilityRole="switch" accessibilityState={ { @@ -223,7 +223,7 @@ exports[`DNDHeader Component should render correctly 1`] = ` "max": undefined, "min": undefined, "now": undefined, - "text": undefined, + "text": "off", } } accessible={true} --- __tests__/screens/ChannelsScreen/__snapshots__/ChannelsScreenTest.tsx.snap @@ -118,8 +118,8 @@ exports[`ChannelsScreen should render expected components 1`] = ` } > <Text - accessibilityLabel="Do not disturb" - accessibilityRole="header" + accessibilityElementsHidden={true} + importantForAccessibility="no-hide-descendants" style={ { "fontFamily": "Bogle-Regular", @@ -131,7 +131,7 @@ exports[`ChannelsScreen should render expected components 1`] = ` Do not disturb </Text> <View - accessibilityLabel="Do not disturb off" + accessibilityLabel="Do not disturb" accessibilityRole="switch" accessibilityState={ { @@ -147,7 +147,7 @@ exports[`ChannelsScreen should render expected components 1`] = ` "max": undefined, "min": undefined, "now": undefined, - "text": undefined, + "text": "off", } } accessible={true} --- src/components/DND/DNDHeader.tsx @@ -68,8 +68,8 @@ export const DNDHeader = ({isLoading = false}: DNDHeaderProps) => { <View style={styles.container}> <Text style={styles.title} - accessibilityRole='header' - accessibilityLabel={t('userHeader.dndPreference')} + importantForAccessibility='no-hide-descendants' + accessibilityElementsHidden={true} > {t('userHeader.dndPreference')} </Text> @@ -81,10 +81,11 @@ export const DNDHeader = ({isLoading = false}: DNDHeaderProps) => { onValueChange={onStatusChange} testID='dndSwitch' accessibilityRole='switch' - accessibilityLabel={`${t('userHeader.dndPreference')} ${ - dndPreference === 'offline' ? 'on' : 'off' - }`} + accessibilityLabel={t('userHeader.dndPreference')} accessibilityState={{selected: dndPreference === 'offline'}} + accessibilityValue={{ + text: dndPreference === 'offline' ? 'on' : 'off' + }} /> )} </View>
fix(SMDV-7769): Fix Do Not Disturb switch accessibility label
fix(SMDV-7769): Fix Do Not Disturb switch accessibility label - Hide label text from screen reader to avoid duplicate announcement - Set proper accessibilityLabel on switch component - Add accessibilityValue to announce on/off state - Update tests and snapshots to reflect accessibility changes - Ensures switch and label are semantically connected JIRA: SMDV-7769
c192332a20dec1321d1192c84f1c3a5b53f3ba13
--- src/components/TeamList.tsx @@ -227,10 +227,8 @@ const StoreTeamItem = (props: {style?: StyleProp<ViewStyle>}) => { []) as Associate[]; return associateList; }, [associateData.data?.getDailyRoster]); - const clockedInCount = - (rosterData as any)?.filter(associateIsClockedIn)?.length ?? 0; - const absentCount = - (rosterData as any)?.filter(associateIsAbsent)?.length ?? 0; + const clockedInCount = rosterData?.filter(associateIsClockedIn)?.length ?? 0; + const absentCount = rosterData?.filter(associateIsAbsent)?.length ?? 0; const startStoreText = useStartStoreText(); const translationContext = useSiteTranslationContext(); @@ -309,9 +307,13 @@ export const TeamChatCard = (props: { const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); const primaryTeam = useGetViewersPrimaryTeamId(); const primaryTeamData = useGetTeamById(primaryTeam); - const clockedInCount = primaryTeamData.data?.getTeamById?.mewClockedInCount; - const absentCount = primaryTeamData.data?.getTeamById?.mewAbsentCount; const {loading, data} = useGetTeamsByStore(); + const teamDetails = useMemo(() => { + const primaryTeamInfo = primaryTeamData.data?.getTeamById; + return primaryTeamInfo; + }, [data?.getTeamsByStore]); + const clockedInCount = teamDetails?.mewClockedInCount; + const absentCount = teamDetails?.mewAbsentCount; const teams = useMemo(() => { const allTeams = (data?.getTeamsByStore || []) as Team[]; return allTeams --- src/containers/RosterFilters.tsx @@ -56,7 +56,6 @@ export const RosterFilters = (props: { associates: Associate[]; onFilter: (filteredAssociates: Associate[], filterId: FilterValue) => void; clockedInCount?: number | null | undefined; - isStoreTeamItem?: boolean; }) => { const {absentCount, associates, clockedInCount, onFilter} = props; const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); --- src/screens/ViewTeamScreen.tsx @@ -28,10 +28,7 @@ export type ViewTeamScreenProps = { export const ViewTeamScreen: React.FC<ViewTeamScreenProps> = (props) => { const {route, navigation} = props; const {teamRoster, teamData, clockedInCount, absentCount} = route.params; - let isStoreTeamItem = false; - if (teamData?.getTeamById === undefined) { - isStoreTeamItem = true; - } + const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); const {bottom: bottomInset} = useSafeAreaInsets(); @@ -74,7 +71,6 @@ export const ViewTeamScreen: React.FC<ViewTeamScreenProps> = (props) => { absentCount={absentCount} associates={teamRoster} clockedInCount={clockedInCount} - isStoreTeamItem={isStoreTeamItem} onFilter={onFilter} /> <RosterHeader --- src/components/TeamList.tsx @@ -227,10 +227,8 @@ const StoreTeamItem = (props: {style?: StyleProp<ViewStyle>}) => { []) as Associate[]; return associateList; }, [associateData.data?.getDailyRoster]); - const clockedInCount = - (rosterData as any)?.filter(associateIsClockedIn)?.length ?? 0; - const absentCount = - (rosterData as any)?.filter(associateIsAbsent)?.length ?? 0; + const clockedInCount = rosterData?.filter(associateIsClockedIn)?.length ?? 0; + const absentCount = rosterData?.filter(associateIsAbsent)?.length ?? 0; const startStoreText = useStartStoreText(); const translationContext = useSiteTranslationContext(); @@ -309,9 +307,13 @@ export const TeamChatCard = (props: { const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); const primaryTeam = useGetViewersPrimaryTeamId(); const primaryTeamData = useGetTeamById(primaryTeam); - const clockedInCount = primaryTeamData.data?.getTeamById?.mewClockedInCount; - const absentCount = primaryTeamData.data?.getTeamById?.mewAbsentCount; const {loading, data} = useGetTeamsByStore(); + const teamDetails = useMemo(() => { + const primaryTeamInfo = primaryTeamData.data?.getTeamById; + return primaryTeamInfo; + }, [data?.getTeamsByStore]); + const clockedInCount = teamDetails?.mewClockedInCount; + const absentCount = teamDetails?.mewAbsentCount; const teams = useMemo(() => { const allTeams = (data?.getTeamsByStore || []) as Team[]; return allTeams --- src/containers/RosterFilters.tsx @@ -56,7 +56,6 @@ export const RosterFilters = (props: { associates: Associate[]; onFilter: (filteredAssociates: Associate[], filterId: FilterValue) => void; clockedInCount?: number | null | undefined; - isStoreTeamItem?: boolean; }) => { const {absentCount, associates, clockedInCount, onFilter} = props; const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); --- src/screens/ViewTeamScreen.tsx @@ -28,10 +28,7 @@ export type ViewTeamScreenProps = { export const ViewTeamScreen: React.FC<ViewTeamScreenProps> = (props) => { const {route, navigation} = props; const {teamRoster, teamData, clockedInCount, absentCount} = route.params; - let isStoreTeamItem = false; - if (teamData?.getTeamById === undefined) { - isStoreTeamItem = true; - } + const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); const {bottom: bottomInset} = useSafeAreaInsets(); @@ -74,7 +71,6 @@ export const ViewTeamScreen: React.FC<ViewTeamScreenProps> = (props) => { absentCount={absentCount} associates={teamRoster} clockedInCount={clockedInCount} - isStoreTeamItem={isStoreTeamItem} onFilter={onFilter} /> <RosterHeader
Removed old code
Removed old code
560277565b3fe6f6daf31c01f61da7ba4ac6d9d7
--- package.json @@ -56,6 +56,7 @@ "@react-native-firebase/perf": "~22.4.0", "@react-native-firebase/remote-config": "~22.4.0", "@react-native-firebase/firestore": "~22.4.0", + "@react-native/normalize-colors": "0.79.5", "react": "19.0.0", "react-native": "0.79.5", "react-test-renderer": "19.0.0", --- yarn.lock @@ -6083,20 +6083,6 @@ __metadata: languageName: node linkType: hard -"@react-native/normalize-colors@npm:0.79.6": - version: 0.79.6 - resolution: "@react-native/normalize-colors@npm:0.79.6::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40react-native%2Fnormalize-colors%2F-%2Fnormalize-colors-0.79.6.tgz" - checksum: 10c0/2bc662b6846a92fe62bc54be34204ad90eeceb9747fdd6f439f3262a8b93a47c1a9f574368749c07636a9a746e2d5b842e9492f55bbfcbe164a1b7385f467ac1 - languageName: node - linkType: hard - -"@react-native/normalize-colors@npm:^0.74.1": - version: 0.74.89 - resolution: "@react-native/normalize-colors@npm:0.74.89::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40react-native%2Fnormalize-colors%2F-%2Fnormalize-colors-0.74.89.tgz" - checksum: 10c0/6d0e5c91793ca5a66b4a0e5995361f474caacac56bde4772ac02b8ab470bd323076c567bd8856b0b097816d2b890e73a4040a3df01fd284adee683f5ba89d5ba - languageName: node - linkType: hard - "@react-native/typescript-config@npm:0.73.1": version: 0.73.1 resolution: "@react-native/typescript-config@npm:0.73.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40react-native%2Ftypescript-config%2F-%2Ftypescript-config-0.73.1.tgz"
fix: add resolutions for normalize-colors and react-test-renderer to fix ci lockfile drift
fix: add resolutions for normalize-colors and react-test-renderer to fix ci lockfile drift
d981079fe02ee3545dec2879bc25a4939dc0c02e
--- package.json @@ -108,10 +108,10 @@ "@walmart/feedback-all-spark-miniapp": "0.9.75", "@walmart/financial-wellbeing-feature-app": "1.29.10", "@walmart/functional-components": "~6.3.28", - "@walmart/global-vpi-mini-app": "1.1.20", + "@walmart/global-vpi-mini-app": "1.1.14", "@walmart/gta-react-native-calendars": "0.7.0", "@walmart/gtp-shared-components": "2.2.7", - "@walmart/ims-print-services-ui": "2.20.0", + "@walmart/ims-print-services-ui": "2.19.2", "@walmart/inbox-mini-app": "0.101.1", "@walmart/invue-react-native-sdk": "0.1.26-alpha.12", "@walmart/iteminfo-mini-app": "8.4.2", @@ -157,13 +157,13 @@ "@walmart/taskit-mini-app": "5.38.2", "@walmart/time-clock-mini-app": "3.19.2", "@walmart/time-clock-mini-app-next": "3.0.0", - "@walmart/topstock-mini-app": "1.24.2", + "@walmart/topstock-mini-app": "1.23.4", "@walmart/translator-mini-app": "1.6.4", "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.23.1#~/.yarn/patches/@walmart-ui-components-npm-1.23.1-247996ccb0.patch", "@walmart/walmart-fiscal-week": "^0.3.6", "@walmart/welcomeme-mini-app": "1.0.12", "@walmart/wfm-ui": "3.0.2", - "@walmart/wm-plus-mini-app": "1.5.4", + "@walmart/wm-plus-mini-app": "1.5.3", "@walmart/wmconnect-mini-app": "3.1.1", "axios": "~1.6.0", "axios-cache-adapter": "patch:axios-cache-adapter@npm%3A2.7.3#~/.yarn/patches/axios-cache-adapter-npm-2.7.3-26c357b785.patch", --- yarn.lock @@ -6983,10 +6983,10 @@ __metadata: languageName: node linkType: hard -"@walmart/global-vpi-mini-app@npm:1.1.20": - version: 1.1.20 - resolution: "@walmart/global-vpi-mini-app@npm:1.1.20::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fglobal-vpi-mini-app%2F-%2F%40walmart%2Fglobal-vpi-mini-app-1.1.20.tgz" - checksum: 10c0/432645b3038070d906ed23a989fc308c9533d2b2ca0ca536de848e02c871c5a074b20e412ee64fb5152040f9c8c1b3dcbb91a8451a07c8651ca51bfb232c85de +"@walmart/global-vpi-mini-app@npm:1.1.14": + version: 1.1.14 + resolution: "@walmart/global-vpi-mini-app@npm:1.1.14::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fglobal-vpi-mini-app%2F-%2F%40walmart%2Fglobal-vpi-mini-app-1.1.14.tgz" + checksum: 10c0/7aa67876145a97c551abbcc796affe5e07d746921e0ee7371e0afa1ec7bae8f421f432b7ba4b48139165675ea40ba60b7926621bf404f84e5eef0693b7452ce2 languageName: node linkType: hard @@ -7048,9 +7048,9 @@ __metadata: languageName: node linkType: hard -"@walmart/ims-print-services-ui@npm:2.20.0": - version: 2.20.0 - resolution: "@walmart/ims-print-services-ui@npm:2.20.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fims-print-services-ui%2F-%2F%40walmart%2Fims-print-services-ui-2.20.0.tgz" +"@walmart/ims-print-services-ui@npm:2.19.2": + version: 2.19.2 + resolution: "@walmart/ims-print-services-ui@npm:2.19.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fims-print-services-ui%2F-%2F%40walmart%2Fims-print-services-ui-2.19.2.tgz" peerDependencies: "@react-native-firebase/analytics": ">=10.5.1" "@react-native-firebase/app": ">=10.5.0" @@ -7070,7 +7070,7 @@ __metadata: react-native: "*" react-native-wm-telemetry: ">=0.2.0" uuid: ">=3.3.2" - checksum: 10c0/a4a4cd21651f46b72d60a8b898e46a600fe2d10fb231639a7d930e88d3f8aedc28f8305bbd98f4cb12730d0fe297b5da5cf7d842a912b926c49c2d7de8daa049 + checksum: 10c0/058f7494314f41fe80cdf42f4189ddafb3065c8df77244d058e3669bb88e4da346978ee37eed70a1b4e32ab0fc7ff8dad2bd74e1dc3487c5f10b608d77c07e97 languageName: node linkType: hard @@ -7438,10 +7438,10 @@ __metadata: "@walmart/feedback-all-spark-miniapp": "npm:0.9.75" "@walmart/financial-wellbeing-feature-app": "npm:1.29.10" "@walmart/functional-components": "npm:~6.3.28" - "@walmart/global-vpi-mini-app": "npm:1.1.20" + "@walmart/global-vpi-mini-app": "npm:1.1.14" "@walmart/gta-react-native-calendars": "npm:0.7.0" "@walmart/gtp-shared-components": "npm:2.2.7" - "@walmart/ims-print-services-ui": "npm:2.20.0" + "@walmart/ims-print-services-ui": "npm:2.19.2" "@walmart/inbox-mini-app": "npm:0.101.1" "@walmart/invue-react-native-sdk": "npm:0.1.26-alpha.12" "@walmart/iteminfo-mini-app": "npm:8.4.2" @@ -7487,13 +7487,13 @@ __metadata: "@walmart/taskit-mini-app": "npm:5.38.2" "@walmart/time-clock-mini-app": "npm:3.19.2" "@walmart/time-clock-mini-app-next": "npm:3.0.0" - "@walmart/topstock-mini-app": "npm:1.24.2" + "@walmart/topstock-mini-app": "npm:1.23.4" "@walmart/translator-mini-app": "npm:1.6.4" "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.23.1#~/.yarn/patches/@walmart-ui-components-npm-1.23.1-247996ccb0.patch" "@walmart/walmart-fiscal-week": "npm:^0.3.6" "@walmart/welcomeme-mini-app": "npm:1.0.12" "@walmart/wfm-ui": "npm:3.0.2" - "@walmart/wm-plus-mini-app": "npm:1.5.4" + "@walmart/wm-plus-mini-app": "npm:1.5.3" "@walmart/wmconnect-mini-app": "npm:3.1.1" adaptive-expressions: "npm:^4.13.5" adaptivecards-templating: "npm:^2.1.0" @@ -8427,9 +8427,9 @@ __metadata: languageName: node linkType: hard -"@walmart/topstock-mini-app@npm:1.24.2": - version: 1.24.2 - resolution: "@walmart/topstock-mini-app@npm:1.24.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ftopstock-mini-app%2F-%2F%40walmart%2Ftopstock-mini-app-1.24.2.tgz" +"@walmart/topstock-mini-app@npm:1.23.4": + version: 1.23.4 + resolution: "@walmart/topstock-mini-app@npm:1.23.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ftopstock-mini-app%2F-%2F%40walmart%2Ftopstock-mini-app-1.23.4.tgz" peerDependencies: "@react-navigation/native": ">=5.8.10" "@react-navigation/stack": ">=5.12.8" @@ -8442,7 +8442,7 @@ __metadata: react-native-haptic-feedback: ">=1.13.0" react-native-vector-icons: ">=6.6.0" react-redux: ">=7.2.0" - checksum: 10c0/38bce24db1ab61e8576411c4522706563b766b66674e7fe82fcd454bfa2a0d847b86cec65f3c2dc8f52186c3adc38ebb5f41bbba61046124725b7a34d86efab2 + checksum: 10c0/023e3537de43a402184da8a5fec4eb0a8cd39cb4e442e275d3bc7eaa4f5fd1ada9501178bc033f30e48d5134e2b83db7729ced0d02d7655ebee824e051d666e9 languageName: node linkType: hard @@ -8579,16 +8579,16 @@ __metadata: languageName: node linkType: hard -"@walmart/wm-plus-mini-app@npm:1.5.4": - version: 1.5.4 - resolution: "@walmart/wm-plus-mini-app@npm:1.5.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwm-plus-mini-app%2F-%2F%40walmart%2Fwm-plus-mini-app-1.5.4.tgz" +"@walmart/wm-plus-mini-app@npm:1.5.3": + version: 1.5.3 + resolution: "@walmart/wm-plus-mini-app@npm:1.5.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwm-plus-mini-app%2F-%2F%40walmart%2Fwm-plus-mini-app-1.5.3.tgz" peerDependencies: "@walmart/allspark-foundation": ">=6.0.0" expo: 50.0.17 expo-image: 1.5.2 react: "*" react-native: "*" - checksum: 10c0/5c5d79f69a038c3a8d79ba0ea3d3ef8c248d8f07b7b5269d190f3f1127fe404efa92793a82f1914376a83d76262f3f31e3a8f3b500657bf9e044b0cd4c269c80 + checksum: 10c0/32c635d9ecb50c3d42eb95abc07ecf8342eeb52fd84b1476be122de5af7ca59783b0350e2c9fc258720c17f0dff73f0832846dacc1d7430f287987ecf2978fa0 languageName: node linkType: hard
feat(lib): check version deprecation
feat(lib): check version deprecation
fb20a72b87703de5fde6ac6666f040365649e3b6
--- src/containers/Message/index.tsx @@ -51,7 +51,6 @@ export const Message = ({ showReadReceipt, }: LocalMessage) => { const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); - // console.log('ruh001x isLastMessage', isLastMessage, message); return ( <View style={[ --- src/containers/Message/index.tsx @@ -51,7 +51,6 @@ export const Message = ({ showReadReceipt, }: LocalMessage) => { const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); - // console.log('ruh001x isLastMessage', isLastMessage, message); return ( <View style={[
removing console.log
removing console.log
5b2dcfabb1f1c8bd5a7320ebf821c50038c8ee53
--- packages/wmconnect-mini-app/src/Translations/locales/en-US.json @@ -77,3 +77,4 @@ "warningAlert.warningMessage": "Unable to load. Please refresh.", "wmConnect.title": "Messages" } +
feat: trigger translations
feat: trigger translations
f694a001e57ae7b33cd6d58443c52616be57f0f3
--- core/src/changeStore/ChangeStoreModal.tsx @@ -131,8 +131,8 @@ export const ChangeStoreModal = ( ) { dispatch( UserActionCreators.UPDATE({ - siteId: currentSite, - workingSite: currentSite, + siteId: String(currentSite), + workingSite: String(currentSite), }), ); Telemetry.logEvent('site_changed', {
fix: change store site id not guarded against site id returned as number
fix: change store site id not guarded against site id returned as number
697f5de9366ba7b1d8c1515ea133c57ed58c1393
--- package-lock.json @@ -3193,9 +3193,9 @@ "integrity": "sha512-R+Kkr3KRExpa59xqPkVPF66+zGo88oZiqbfFx+BzrIJE6eUTUKTGCeiidVci+xjmfSnp6TKrMUkRBxh2b/GffA==" }, "@walmart/time-clock-mini-app": { - "version": "0.1.46", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.1.46.tgz", - "integrity": "sha512-rInIP3R6M37DD/MRlERWy2cv/6o8duRph/eIrV4UUHfm5zlm8jaYhmyaQ2mr1jHEI8ROWyyvZFQUXw74VEXquA==", + "version": "0.1.47", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.1.47.tgz", + "integrity": "sha512-J6UkJCpxMOHUUDhFZwqlqhINLb6lMtF3kSrkOYeyTMBZb6qvpuIgZ4NNkfeRpMmFQjK2v//A2zeoJEpEOhzyvw==", "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.59", "@walmart/settings-mini-app": "1.1.20", - "@walmart/time-clock-mini-app": "0.1.46", + "@walmart/time-clock-mini-app": "0.1.47", "@walmart/ui-components": "1.0.97", "@walmart/welcomeme-mini-app": "0.5.27", "i18next": "^19.7.0",
Added impersonation action to startup saga (#404)
Added impersonation action to startup saga (#404) Co-authored-by: Hitesh Arora - h0a006n <Hitesh.Arora@walmart.com>
1d38df64aa2a0e5e678159f1119f97c6dc503af3
--- src/presence/sagas.ts @@ -6,6 +6,7 @@ import { } from '../redux/selectors'; import {SiteSelectors} from '@walmart/redux-store'; import {getLastOfflineTime, goOnlineForUser} from './service'; +import {isNil} from "lodash"; export function* DoNotDisturbAutoResetSaga() { const userId: string = yield select(getEncryptedUserId); @@ -14,7 +15,7 @@ export function* DoNotDisturbAutoResetSaga() { const dndAutoSwitchThreshold: number = yield select(DNDAutoSwitchThreshold); const lastOfflineTime: number = yield call(getLastOfflineTime); - if (lastOfflineTime) { + if (!isNil(lastOfflineTime)) { let currentTime = Math.round(Date.now() / 1000); let timeSpentOffline = Math.round(currentTime - lastOfflineTime); const timeRemaining = dndOfflineTimeLimit - timeSpentOffline; --- src/presence/service.ts @@ -4,6 +4,7 @@ import {createUserDocumentPath} from './utils'; import AsyncStorage from '@react-native-async-storage/async-storage'; import {LOCAL_STORAGE_KEY_PREFIX} from '../constants'; import {logger} from '../logger/Logger'; +import {isNil} from "lodash"; const LAST_OFFLINE_CACHE_KEY = `${LOCAL_STORAGE_KEY_PREFIX}_dnd_last_offline`; @@ -61,7 +62,7 @@ export const getLastOfflineTime = async (): Promise<number | null> => { const lastOfflineTimeFromStorage = await AsyncStorage.getItem( LAST_OFFLINE_CACHE_KEY, ); - return lastOfflineTimeFromStorage + return !isNil(lastOfflineTimeFromStorage) && lastOfflineTimeFromStorage !== '' ? parseInt(JSON.parse(lastOfflineTimeFromStorage), 10) : null; }; --- src/presence/sagas.ts @@ -6,6 +6,7 @@ import { } from '../redux/selectors'; import {SiteSelectors} from '@walmart/redux-store'; import {getLastOfflineTime, goOnlineForUser} from './service'; +import {isNil} from "lodash"; export function* DoNotDisturbAutoResetSaga() { const userId: string = yield select(getEncryptedUserId); @@ -14,7 +15,7 @@ export function* DoNotDisturbAutoResetSaga() { const dndAutoSwitchThreshold: number = yield select(DNDAutoSwitchThreshold); const lastOfflineTime: number = yield call(getLastOfflineTime); - if (lastOfflineTime) { + if (!isNil(lastOfflineTime)) { let currentTime = Math.round(Date.now() / 1000); let timeSpentOffline = Math.round(currentTime - lastOfflineTime); const timeRemaining = dndOfflineTimeLimit - timeSpentOffline; --- src/presence/service.ts @@ -4,6 +4,7 @@ import {createUserDocumentPath} from './utils'; import AsyncStorage from '@react-native-async-storage/async-storage'; import {LOCAL_STORAGE_KEY_PREFIX} from '../constants'; import {logger} from '../logger/Logger'; +import {isNil} from "lodash"; const LAST_OFFLINE_CACHE_KEY = `${LOCAL_STORAGE_KEY_PREFIX}_dnd_last_offline`; @@ -61,7 +62,7 @@ export const getLastOfflineTime = async (): Promise<number | null> => { const lastOfflineTimeFromStorage = await AsyncStorage.getItem( LAST_OFFLINE_CACHE_KEY, ); - return lastOfflineTimeFromStorage + return !isNil(lastOfflineTimeFromStorage) && lastOfflineTimeFromStorage !== '' ? parseInt(JSON.parse(lastOfflineTimeFromStorage), 10) : null; };
handle null and empty string
handle null and empty string
29eab8fae87bff7a185c099aff09242bcaf54523
--- packages/me-at-walmart-container/src/registries/AskSam/README.md @@ -1,3 +0,0 @@ -# Ask Sam Widget Registry - -https://confluence.walmart.com/display/ALLSPARK/Ask+Sam+Widget+Registry --- packages/me-at-walmart-container/src/registries/AskSam/index.ts @@ -1,13 +0,0 @@ -import { FunctionComponent } from 'react'; -import { createRegistryHook, WidgetRegistry } from '@walmart/allspark-utils'; -import { AskSamWidgetProps } from './types'; - -type AskSamWidgetMap = Record<string, FunctionComponent<AskSamWidgetProps>>; - -export const AskSamWidgetRegistry = new WidgetRegistry<AskSamWidgetMap>( - 'ask_sam_chat' -); - -export const useAskSamWidgetRegistry = createRegistryHook(AskSamWidgetRegistry); - -export type { AskSamWidgetProps }; --- packages/me-at-walmart-container/src/registries/AskSam/types.ts @@ -1,84 +0,0 @@ -import { StyleProp, ViewStyle } from 'react-native'; - -export type ThisTimeEntity = - | 'thissunday' - | 'thissaturday' - | 'thisfriday' - | 'thisthursday' - | 'thiswednesday' - | 'thistuesday' - | 'thismonday' - | 'thisweek'; - -export type NextTimeEntity = - | 'nextsunday' - | 'nextsaturday' - | 'nextfriday' - | 'nextthursday' - | 'nextwednesday' - | 'nexttuesday' - | 'nextmonday' - | 'nextweek'; - -export type TimeEntity = - | 'nfm' - | 'ytd' - | 'lfq' - | 'qtd' - | 'lfm' - | 'mtd' - | 'wtd' - | 'lfw' - | 'tdy' - | 'yesterday' - | 'tomorrow'; - -export type AskSamEntities = Partial<{ - confirm: 'yes' | 'no'; - coronavirustopic: 'confirmedcases' | 'statemandates' | 'leavepolicy'; - dept: string; - emailstatus: 'flagged' | 'unread'; - food: string; - freighttype: 'groc' | 'rdc' | 'hvdc' | 'fdd' | 'mp'; - groupname: string; - help: string; - itemcatg: string; - level: 'division' | 'store' | 'region' | 'market' | 'company'; - levelnumber: string; - modstatus: 'ready' | 'upcoming' | 'current'; - name: string; - number: string; - obwcategory: string; - obwtopic: string; - oscarequesttype: 'lsv' | 'osca'; - outsrequesttype: 'unscanned' | 'scanned' | 'outs'; - plannedsales: string; - queryitem: string; - rank: 'rank'; - role: string; - self: 'i' | 'my'; - supporttype: - | 'compliance' - | 'associateemergency' - | 'eoc' - | 'sedgewick' - | 'health' - | 'acnt' - | 'ogp' - | 'workday' - | 'dotcom' - | 'fieldsupport' - | 'maintenance' - | 'callins'; - time: TimeEntity | ThisTimeEntity | NextTimeEntity; - type: 'profit' | 'selling' | 'd1d2'; - upcomingschedule: 'next' | 'after'; - vpitopic: string; - walmartplus: string; - wplusquestion: string; -}>; - -export type AskSamWidgetProps = { - entities: AskSamEntities; - style?: StyleProp<ViewStyle>; -}; --- packages/me-at-walmart-container/src/registries/Core.ts @@ -1,70 +0,0 @@ -import { FunctionComponent } from 'react'; -import { StyleProp, ViewStyle } from 'react-native'; -import { - WidgetRegistry, - createWidgetRegistryHooks, - WidgetTypeMap, -} from '@walmart/allspark-utils'; - -// --- Banners --- // -export type NavigationBannerProps = { - route?: string; - style?: StyleProp<ViewStyle>; -}; - -type BannerWidgetMap = Record<string, FunctionComponent<NavigationBannerProps>>; - -export const NavigationBannerRegistry = new WidgetRegistry<BannerWidgetMap>( - 'navigation_banner' -); - -export const { - useRegistry: useNavigationBannerRegistry, - useCreateAllRegistryWidgets: useNavigationBanners, -} = createWidgetRegistryHooks(NavigationBannerRegistry); - -// --- Tab Badges --- // -type Tabs = 'home' | 'me' | 'askSam' | 'myTeam' | 'taskit' | 'inbox'; - -export type TabBadgeProps = { - style?: StyleProp<ViewStyle>; -}; - -export const TabBadgeRegistry = new WidgetRegistry< - Record<Tabs, FunctionComponent<TabBadgeProps>> ->('tab_badges'); - -export const { - useRegistry: useTabBadgeRegistry, - useCreateAllRegistryWidgets: useTabBadges, -} = createWidgetRegistryHooks(TabBadgeRegistry); - -// --- Stack Headers --- // -type Stacks = Tabs | 'main'; - -export type HeaderLeftRightProps = { - style?: StyleProp<ViewStyle>; -}; - -type HeaderLeftWidgetMap = Record< - Stacks, - FunctionComponent<HeaderLeftRightProps> ->; - -export const HeaderLeftRegistry = new WidgetRegistry<HeaderLeftWidgetMap>( - 'header_left' -); - -const t = {} as HeaderLeftWidgetMap; -const testFn = (v: WidgetTypeMap) => v; -testFn(t); - -export const { useRegistry: useHeaderLeftRegistry } = - createWidgetRegistryHooks(HeaderLeftRegistry); - -export const HeaderRightRegistry = new WidgetRegistry<HeaderLeftWidgetMap>( - 'header_right' -); - -export const { useRegistry: useHeaderRightRegistry } = - createWidgetRegistryHooks(HeaderRightRegistry); --- packages/me-at-walmart-container/src/registries/Home.ts @@ -1,19 +0,0 @@ -import { FunctionComponent } from 'react'; -import { StyleProp, ViewStyle } from 'react-native'; -import { createRegistryHook, WidgetRegistry } from '@walmart/allspark-utils'; - -export interface HomeWidgetProps { - refresh: boolean; - refreshKey: string; - onRefreshStart: (key: string) => void; - onRefreshEnd: (key: string) => void; - style?: StyleProp<ViewStyle>; -} - -type HomeWidgetMap = Record<string, FunctionComponent<HomeWidgetProps>>; - -export const HomeWidgetRegistry = new WidgetRegistry<HomeWidgetMap>( - 'home_dashboard' -); - -export const useHomeWidgetRegistry = createRegistryHook(HomeWidgetRegistry); --- packages/me-at-walmart-container/src/registries/Inbox.ts @@ -1,9 +0,0 @@ -import { WidgetRegistry } from '@walmart/allspark-utils'; -import { FunctionComponent } from 'react'; - -const INBOX_WIDET_REGISTRY_KEY = 'inbox'; - -type InboxWidgetMap = Record<string, FunctionComponent<any>>; -export const InboxWidgetRegistry = new WidgetRegistry<InboxWidgetMap>( - INBOX_WIDET_REGISTRY_KEY -); --- packages/me-at-walmart-container/src/registries/Metrics.ts @@ -1,20 +0,0 @@ -import { FunctionComponent } from 'react'; -import { StyleProp, ViewStyle } from 'react-native'; -import { useRegistry, WidgetRegistry } from '@walmart/allspark-utils'; - -export type PayloadStatusType = 'ok' | 'stale' | 'failed'; - -export interface MetricsWidgetProps { - onNetworkCallback: (payloadStatus: PayloadStatusType) => void; - teamDepartments?: number[]; - style?: StyleProp<ViewStyle>; -} - -type MetricsWidgetMap = Record<string, FunctionComponent<MetricsWidgetProps>>; - -export const MetricsWidgetRegistry = new WidgetRegistry<MetricsWidgetMap>( - 'metrics' -); - -export const useMetricsWidgetRegistry = () => - useRegistry(MetricsWidgetRegistry); --- packages/me-at-walmart-container/src/registries/index.tsx @@ -1,5 +0,0 @@ -export * from './AskSam'; -export * from './Core'; -export * from './Home'; -export * from './Metrics'; -export * from './Inbox';
fix: remove registry implementation from container package. handled by legacy library until features migrate
fix: remove registry implementation from container package. handled by legacy library until features migrate
14359fd01ba28173cc34aec9dc98f9f056298e27
--- package-lock.json @@ -58,7 +58,7 @@ "@walmart/manager-approvals-miniapp": "0.1.2", "@walmart/me-field-mini-app": "1.1.35", "@walmart/metrics-mini-app": "0.9.33", - "@walmart/mod-flex-mini-app": "1.3.9", + "@walmart/mod-flex-mini-app": "1.3.10", "@walmart/moment-walmart": "1.0.4", "@walmart/OneWalmart-MiniApp": "1.0.12", "@walmart/pay-stub-miniapp": "0.9.7", @@ -5389,9 +5389,9 @@ "license": "MIT" }, "node_modules/@walmart/mod-flex-mini-app": { - "version": "1.3.9", - "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.3.9.tgz", - "integrity": "sha512-v2goguOpQNLSl7Jrx/+e5bN67OGN5e/DyTmK1SN6oTKkkt0/Uq6VFAnai7Zd6IdqTd6IEiu3Ond4JXHLyoukvg==", + "version": "1.3.10", + "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.3.10.tgz", + "integrity": "sha512-atpUsDHyyv6RFxyVCS4v9PCiV3XUk4pzCBVh4lVZN5gFgQxw14pKKkcMmmqhX6U0UKf+fjL8XTjhMvhvtNAsJQ==", "peerDependencies": { "@react-native-community/async-storage": "^1.11.0", "@react-native-picker/picker": "^2.4.2", @@ -24919,9 +24919,9 @@ } }, "@walmart/mod-flex-mini-app": { - "version": "1.3.9", - "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.3.9.tgz", - "integrity": "sha512-v2goguOpQNLSl7Jrx/+e5bN67OGN5e/DyTmK1SN6oTKkkt0/Uq6VFAnai7Zd6IdqTd6IEiu3Ond4JXHLyoukvg==" + "version": "1.3.10", + "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.3.10.tgz", + "integrity": "sha512-atpUsDHyyv6RFxyVCS4v9PCiV3XUk4pzCBVh4lVZN5gFgQxw14pKKkcMmmqhX6U0UKf+fjL8XTjhMvhvtNAsJQ==" }, "@walmart/moment-walmart": { "version": "1.0.4" --- package.json @@ -101,7 +101,7 @@ "@walmart/manager-approvals-miniapp": "0.1.2", "@walmart/me-field-mini-app": "1.1.35", "@walmart/metrics-mini-app": "0.9.33", - "@walmart/mod-flex-mini-app": "1.3.9", + "@walmart/mod-flex-mini-app": "1.3.10", "@walmart/moment-walmart": "1.0.4", "@walmart/pay-stub-miniapp": "0.9.7", "@walmart/payrollsolution_miniapp": "0.130.4",
Bumping modflex to 1.3.10
Bumping modflex to 1.3.10
ea05b3eeaadebfe3d8e3f25e973efd3ffc5c8f54
--- packages/allspark-foundation/src/Components/Onboarding/TeamSelection/Utils/sectionListData.ts @@ -9,14 +9,14 @@ export function createSections( { title: myArea, data: areaTeamMap[myArea], - isPrimaryArea: true, + isPrimaryArea: true, //TODO: replace the value with api response }, ...areas .filter((area: Area) => area !== myArea) .map((area: Area) => ({ title: area, data: areaTeamMap[area], - isPrimaryArea: false, + isPrimaryArea: false, //TODO: replace the value with api response })), ];
Update sectionListData.ts
Update sectionListData.ts
2885ab4c806e73c6f8a12ccc7d8e1d6517acb2fe
--- src/navigation/AssociateHallwayNav/Tabs/MeStackNav.tsx @@ -2,8 +2,6 @@ import React from 'react'; import {createStackNavigator} from '@react-navigation/stack'; import {useTranslation} from '@walmart/core-services/Translations'; -import {ScheduleMiniApp} from '@walmart/schedule-mini-app'; - import { MeMiniApp, ContactInfoNav, @@ -11,7 +9,6 @@ import { EducationHistoryNav, CertificationsNav, } from '@walmart/profile-feature-app'; - import {DrawerButton, Header} from '@walmart/ui-components'; import {PaymentSelectionMiniApp} from '@walmart/payrollsolution_miniapp'; import {TimeClockTabs} from '@walmart/time-clock-mini-app';
fix lint
fix lint
a46bb78c02fb373b55aef92dc1f5d793da9e8096
--- yarn.lock @@ -6775,12 +6775,13 @@ __metadata: languageName: node linkType: hard -"@walmart/facilities-management-miniapp@npm:0.17.1": - version: 0.17.1 - resolution: "@walmart/facilities-management-miniapp@npm:0.17.1" +"@walmart/facilities-management-miniapp@npm:0.16.0-beta19": + version: 0.16.0-beta19 + resolution: "@walmart/facilities-management-miniapp@npm:0.16.0-beta19" peerDependencies: "@walmart/allspark-foundation": "*" - checksum: 10c0/7c79ec34c2364dac74f01fd4c6df2f81fe22206b055ed34ca75bc851f41da863f10f4e5c5e7887b894c105ffd56f7113b3d211f2e75fda9d91ae89bd4f1e870a + redux: "*" + checksum: 10c0/42ab34d5a338c739ef0e4dad0166b5ca8e5994e7828f6406b1e888e943b6f53cbb65ed76654484d2e1306eb39911ad021682508b0fc921ebfa4cec1d1a9442da languageName: node linkType: hard
version bump
version bump
e37ff4f510eeefe8b0b0837d2770f7ed668a3e49
--- package-lock.json @@ -3278,9 +3278,9 @@ } }, "@walmart/welcomeme-mini-app": { - "version": "0.24.2", - "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.24.2.tgz", - "integrity": "sha512-/Z0lKbKbpupLy48OfvcWgH1e2PKmR/yV4/gz9LTwmh4LYnRV02X7zTSjR0rNCNALG0x+nKqu5490+/dN9v0Uvg==" + "version": "0.26.2", + "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.26.2.tgz", + "integrity": "sha512-7Vo1RcnaETMYG6nFrGtwPjzc35rA+lS9RWY96lL7N9hsbwnPvmN/7m5QCp8XYSj+mBWok5yvikls+MgJsuyNZw==" }, "@walmart/wfm-ui": { "version": "0.1.50", --- package.json @@ -88,7 +88,7 @@ "@walmart/settings-mini-app": "1.2.3", "@walmart/time-clock-mini-app": "0.3.4", "@walmart/ui-components": "1.1.34", - "@walmart/welcomeme-mini-app": "0.24.2", + "@walmart/welcomeme-mini-app": "0.26.2", "@walmart/wfm-ui": "^0.1.50", "axios-cache-adapter": "2.7.3", "crypto-js": "^3.3.0",
welcomeMe-mini minor version bump
welcomeMe-mini minor version bump
e99e6c4028627712b837fce959242f5e81f0c67a
--- .codepulseai.yml
Update config for code pulse ai
Update config for code pulse ai
00359d46634b8ed9d838ca81851f714d791241ac
--- src/home/components/TaskCard/TaskClockStatusTeamCard2.tsx @@ -66,7 +66,6 @@ export const TaskClockStatusTeamCard2: FC<TaskCardProps> = (props) => { // team name in image file & translation file is same and w/o any whitespace or special character. // Replace everything(' ' , '/', etc) but alphabets to make it one word const teamImage = teamName?.replace(/[^a-zA-Z]/g, ''); - console.log('ruh teamImage', teamImage); let teamDisplayText = `Store #${storeId}`; if (teamName) { teamDisplayText =
removing console.log
removing console.log
1c5f097eee6acb87cb0df559150b74088001897b
--- package-lock.json @@ -57,7 +57,7 @@ "@walmart/inbox-mini-app": "0.81.3", "@walmart/iteminfo-mini-app": "5.3.2", "@walmart/manager-approvals-miniapp": "0.1.2", - "@walmart/me-field-mini-app": "1.1.40", + "@walmart/me-field-mini-app": "1.1.41", "@walmart/metrics-mini-app": "0.9.38", "@walmart/mod-flex-mini-app": "1.3.15", "@walmart/moment-walmart": "1.0.4", @@ -5435,9 +5435,9 @@ } }, "node_modules/@walmart/me-field-mini-app": { - "version": "1.1.40", - "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-1.1.40.tgz", - "integrity": "sha512-TQnD27JmXKV5++VL7O4GYvqkcqZ/HAQWlpqxVynIJnidoB0lWJENs+OtaDIYdqEcQy1mdFZVDp2BvZHzMbpy+w==", + "version": "1.1.41", + "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-1.1.41.tgz", + "integrity": "sha512-LZ8bH5YYJ2Eg9CQtPm/L08tGABsl2qgfkkR1YPqEol0oIiw+1Z0Zgr93kBRxGERA1y+tYvWmA7nAb1lgRCGkmA==", "hasInstallScript": true, "peerDependencies": { "@atmt/feedback-component-native": "^8.0.0", @@ -25251,9 +25251,9 @@ "integrity": "sha512-zOmvEEul9aMoJhNbE2Hz1FxxeXGovIwPojGjvjyhHBDcHTQGWHJVX5d2WpxgRk7M81jBnEzluDU5dJHK9bf3oQ==" }, "@walmart/me-field-mini-app": { - "version": "1.1.40", - "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-1.1.40.tgz", - "integrity": "sha512-TQnD27JmXKV5++VL7O4GYvqkcqZ/HAQWlpqxVynIJnidoB0lWJENs+OtaDIYdqEcQy1mdFZVDp2BvZHzMbpy+w==" + "version": "1.1.41", + "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-1.1.41.tgz", + "integrity": "sha512-LZ8bH5YYJ2Eg9CQtPm/L08tGABsl2qgfkkR1YPqEol0oIiw+1Z0Zgr93kBRxGERA1y+tYvWmA7nAb1lgRCGkmA==" }, "@walmart/metrics-mini-app": { "version": "0.9.38", --- package.json @@ -100,7 +100,7 @@ "@walmart/inbox-mini-app": "0.81.3", "@walmart/iteminfo-mini-app": "5.3.2", "@walmart/manager-approvals-miniapp": "0.1.2", - "@walmart/me-field-mini-app": "1.1.40", + "@walmart/me-field-mini-app": "1.1.41", "@walmart/metrics-mini-app": "0.9.38", "@walmart/mod-flex-mini-app": "1.3.15", "@walmart/moment-walmart": "1.0.4",
feat: :package: Bump learning mini app version to 1.1.41
feat: :package: Bump learning mini app version to 1.1.41
95b839abdf1637add5f1218cc2efc5696d2f9e5e
--- .yarn/patches/react-native-modal-npm-13.0.1-f1a75332f0.patch @@ -1,13 +0,0 @@ -diff --git a/dist/modal.js b/dist/modal.js -index 80f4e751b165e9730cc74eae7d3cba9b6aef0f6f..6902c9406da92248d9d1f9fc1342aaacabee89fe 100644 ---- a/dist/modal.js -+++ b/dist/modal.js -@@ -418,7 +418,7 @@ export class ReactNativeModal extends React.Component { - } - // If there's no custom backdrop, handle presses with - // TouchableWithoutFeedback -- return (React.createElement(TouchableWithoutFeedback, { onPress: onBackdropPress }, backdropWrapper)); -+ return (React.createElement(TouchableWithoutFeedback, { onPress: onBackdropPress, accessible: false, focusable: false }, backdropWrapper)); - }; - const { animationIn, animationOut } = buildAnimations(extractAnimationFromProps(props)); - this.animationIn = animationIn; --- .yarn/patches/react-native-modal-npm-14.0.0-rc.1-55593d101a.patch @@ -0,0 +1,13 @@ +diff --git a/dist/modal.js b/dist/modal.js +index 74edee454ea8449e45dc21b96066d3de5d58535a..7d175f4c8ff4a5220720289e23175aece330bbda 100644 +--- a/dist/modal.js ++++ b/dist/modal.js +@@ -499,7 +499,7 @@ export class ReactNativeModal extends React.Component { + } + // If there's no custom backdrop, handle presses with + // TouchableWithoutFeedback +- return (React.createElement(TouchableWithoutFeedback, { onPress: onBackdropPress }, backdropWrapper)); ++ return (React.createElement(TouchableWithoutFeedback, { onPress: onBackdropPress, accessible: false, focusable: false }, backdropWrapper)); + }; + render() { + /* eslint-disable @typescript-eslint/no-unused-vars */ --- package.json @@ -438,7 +438,7 @@ "moment-timezone": "~0.5.43", "moment": "^2.29.4", "react-native-calendars": "^1.1291.0", - "react-native-modal@npm:^13.0.1": "patch:react-native-modal@npm%3A13.0.1#~/.yarn/patches/react-native-modal-npm-13.0.1-f1a75332f0.patch", + "react-native-modal": "patch:react-native-modal@npm%3A14.0.0-rc.1#~/.yarn/patches/react-native-modal-npm-14.0.0-rc.1-55593d101a.patch", "react-native-pdf": "patch:react-native-pdf@npm%3A6.7.7#~/.yarn/patches/react-native-pdf-npm-6.7.7-45614b38a1.patch", "typescript": "~5.3.3", "uuid": "^3.3.2", --- yarn.lock @@ -20694,7 +20694,7 @@ __metadata: languageName: node linkType: hard -"prop-types@npm:*, prop-types@npm:15.8.1, prop-types@npm:^15.5.10, prop-types@npm:^15.5.7, prop-types@npm:^15.6.1, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.0, prop-types@npm:^15.8.1": +"prop-types@npm:*, prop-types@npm:15.8.1, prop-types@npm:^15.5.10, prop-types@npm:^15.5.7, prop-types@npm:^15.6.1, prop-types@npm:^15.7.2, prop-types@npm:^15.8.0, prop-types@npm:^15.8.1": version: 15.8.1 resolution: "prop-types@npm:15.8.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fprop-types%2F-%2Fprop-types-15.8.1.tgz" dependencies: @@ -21053,12 +21053,12 @@ __metadata: languageName: node linkType: hard -"react-native-animatable@npm:1.3.3": - version: 1.3.3 - resolution: "react-native-animatable@npm:1.3.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Freact-native-animatable%2F-%2Freact-native-animatable-1.3.3.tgz" +"react-native-animatable@npm:1.4.0": + version: 1.4.0 + resolution: "react-native-animatable@npm:1.4.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Freact-native-animatable%2F-%2Freact-native-animatable-1.4.0.tgz" dependencies: - prop-types: "npm:^15.7.2" - checksum: 10c0/ce18b871c29d17377c08aa143be64d06e20df8e669720d2fe4eed5465c37ac4e6ebbfb4464aecb23e3e22d82114768dfacb65b0c49c33dd736f54a0507265641 + prop-types: "npm:^15.8.1" + checksum: 10c0/658f15aa3744c3d6a22a44ab4609afc4335ff06d0a200a1fba513e470ebb4bd561ab709204b3777ee53cad526f695e2b4290e057a50fcd461aca337e407fe2b1 languageName: node linkType: hard @@ -21359,29 +21359,27 @@ __metadata: languageName: node linkType: hard -"react-native-modal@npm:13.0.1": - version: 13.0.1 - resolution: "react-native-modal@npm:13.0.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Freact-native-modal%2F-%2Freact-native-modal-13.0.1.tgz" +"react-native-modal@npm:14.0.0-rc.1": + version: 14.0.0-rc.1 + resolution: "react-native-modal@npm:14.0.0-rc.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Freact-native-modal%2F-%2Freact-native-modal-14.0.0-rc.1.tgz" dependencies: - prop-types: "npm:^15.6.2" - react-native-animatable: "npm:1.3.3" + react-native-animatable: "npm:1.4.0" peerDependencies: react: "*" - react-native: ">=0.65.0" - checksum: 10c0/8ec5728c2a27eb31c97451968b4ecefdf005afda51fab2fc864fc442122573c70f7bf3fa0c6e3bd1d6aab3565c684104d1d30df916c3f9a6c7c3223e4d3b9249 + react-native: ">=0.70.0" + checksum: 10c0/f392008da6456d73819536f2628d4fb536a0634131c957a62ac0b68f65391a0e1473fa297c9873dd5a5c8de32c380464bb48cbfaafe9cfff0abfda6db3486154 languageName: node linkType: hard -"react-native-modal@patch:react-native-modal@npm%3A13.0.1#~/.yarn/patches/react-native-modal-npm-13.0.1-f1a75332f0.patch": - version: 13.0.1 - resolution: "react-native-modal@patch:react-native-modal@npm%3A13.0.1%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252Freact-native-modal%252F-%252Freact-native-modal-13.0.1.tgz#~/.yarn/patches/react-native-modal-npm-13.0.1-f1a75332f0.patch::version=13.0.1&hash=28f295" +"react-native-modal@patch:react-native-modal@npm%3A14.0.0-rc.1#~/.yarn/patches/react-native-modal-npm-14.0.0-rc.1-55593d101a.patch": + version: 14.0.0-rc.1 + resolution: "react-native-modal@patch:react-native-modal@npm%3A14.0.0-rc.1%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252Freact-native-modal%252F-%252Freact-native-modal-14.0.0-rc.1.tgz#~/.yarn/patches/react-native-modal-npm-14.0.0-rc.1-55593d101a.patch::version=14.0.0-rc.1&hash=09a301" dependencies: - prop-types: "npm:^15.6.2" - react-native-animatable: "npm:1.3.3" + react-native-animatable: "npm:1.4.0" peerDependencies: react: "*" - react-native: ">=0.65.0" - checksum: 10c0/7dffe995783d80952f24d0a4532343877c63746d5c401cfd580fd7da99e6896e04c8180a2935a7a9031e758baa8cf6eff1486732f582941134f683c562f341b3 + react-native: ">=0.70.0" + checksum: 10c0/f726c57446804808838d9c3f8fff817f058dcffb68dcd112fe0d52e90663cd3420f5f38fca7482fc976fe99744a72d52751661e0601c0491915fe61c649850f4 languageName: node linkType: hard
fix: update RN modal for RN 77 compatibility (#4629)
fix: update RN modal for RN 77 compatibility (#4629)
7e640634f78d45b407a1b95ad4fb85b3557a4126
--- package-lock.json @@ -63,7 +63,7 @@ "@walmart/onewalmart-miniapp": "1.0.14", "@walmart/pay-stub-miniapp": "0.9.28", "@walmart/payrollsolution_miniapp": "0.130.28", - "@walmart/price-changes-mini-app": "1.8.6", + "@walmart/price-changes-mini-app": "1.8.7", "@walmart/profile-feature-app": "0.143.0", "@walmart/push-to-talk-mini-app": "1.9.22", "@walmart/react-native-encrypted-storage": "1.1.3", @@ -5665,9 +5665,9 @@ } }, "node_modules/@walmart/price-changes-mini-app": { - "version": "1.8.5", - "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.8.5.tgz", - "integrity": "sha512-GS8q0tV15GafUzoKB6biQvaNJiQ6kH/W9lbIWQEkiD12F9sdeoifLyY+a1QLol8zMmRuH+Mpk2/VI0iRt8vuYg==", + "version": "1.8.7", + "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.8.7.tgz", + "integrity": "sha512-M+CKb5lcsa+whMCVUh+D50N0JSLRLyBdmWAMEZn8DI0ks9+MtWQ6XIEyiPKD9q4c8UQGm2AZ+tgiGIT7hcg+IA==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -25245,9 +25245,9 @@ } }, "@walmart/price-changes-mini-app": { - "version": "1.8.5", - "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.8.5.tgz", - "integrity": "sha512-GS8q0tV15GafUzoKB6biQvaNJiQ6kH/W9lbIWQEkiD12F9sdeoifLyY+a1QLol8zMmRuH+Mpk2/VI0iRt8vuYg==" + "version": "1.8.7", + "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.8.7.tgz", + "integrity": "sha512-M+CKb5lcsa+whMCVUh+D50N0JSLRLyBdmWAMEZn8DI0ks9+MtWQ6XIEyiPKD9q4c8UQGm2AZ+tgiGIT7hcg+IA==" }, "@walmart/profile-feature-app": { "version": "0.143.0" --- package.json @@ -105,7 +105,7 @@ "@walmart/onewalmart-miniapp": "1.0.14", "@walmart/pay-stub-miniapp": "0.9.28", "@walmart/payrollsolution_miniapp": "0.130.28", - "@walmart/price-changes-mini-app": "1.8.6", + "@walmart/price-changes-mini-app": "1.8.7", "@walmart/profile-feature-app": "0.143.0", "@walmart/push-to-talk-mini-app": "1.9.22", "@walmart/react-native-encrypted-storage": "1.1.3",
chore: bumping PC to 1.8.7
chore: bumping PC to 1.8.7
1139be20ff66d95a7390733f3673042244f951ea
--- package.json @@ -82,7 +82,7 @@ "@shopify/flash-list": "1.7.6", "@terrylinla/react-native-sketch-canvas": "patch:@terrylinla/react-native-sketch-canvas@npm%3A0.8.0#~/.yarn/patches/@terrylinla-react-native-sketch-canvas-npm-0.8.0-c7b2afd4cd.patch", "@walmart/allspark-authentication": "7.1.4", - "@walmart/allspark-cope-key-listener": "0.0.18", + "@walmart/allspark-cope-key-listener": "0.0.19", "@walmart/allspark-foundation": "7.17.7", "@walmart/allspark-foundation-hub": "1.25.25", "@walmart/allspark-graphql-client": "~6.3.28", --- yarn.lock @@ -7505,10 +7505,10 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-cope-key-listener@npm:0.0.18": - version: 0.0.18 - resolution: "@walmart/allspark-cope-key-listener@npm:0.0.18::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fallspark-cope-key-listener%2F-%2Fallspark-cope-key-listener-0.0.18.tgz" - checksum: 10c0/d5fa39b98c6175e28eb4a5d915516b510ea6e3a040b39d5b20d118429bfad2f32dd55f18388d57b8eaddce6a57e27ec0d31af8270808027dbe03764f1b392865 +"@walmart/allspark-cope-key-listener@npm:0.0.19": + version: 0.0.19 + resolution: "@walmart/allspark-cope-key-listener@npm:0.0.19::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fallspark-cope-key-listener%2F-%2F%40walmart%2Fallspark-cope-key-listener-0.0.19.tgz" + checksum: 10c0/4d0bcf9fb6ff60cf5e044dae88550db4f37580dee32082ab57ac54ba00be941fe34de733313188a238a8a9b48bedda941188ec0c65f8ff8afa1ba285b528a54f languageName: node linkType: hard @@ -8854,7 +8854,7 @@ __metadata: "@types/react-native-vector-icons": "npm:6.4.18" "@walmart/allspark-authentication": "npm:7.1.4" "@walmart/allspark-build-cache-provider": "npm:1.1.1" - "@walmart/allspark-cope-key-listener": "npm:0.0.18" + "@walmart/allspark-cope-key-listener": "npm:0.0.19" "@walmart/allspark-foundation": "npm:7.17.7" "@walmart/allspark-foundation-hub": "npm:1.25.25" "@walmart/allspark-graphql-client": "npm:~6.3.28"
chore(bump): ALLSPARK-7494 side button new arch version bump (#5298)
chore(bump): ALLSPARK-7494 side button new arch version bump (#5298) Co-authored-by: Hariharan Sundaram <hariharan.sundaram0@walmart.com> Co-authored-by: Hariharan Sundaram <121838+h0s0em0@users.noreply.gecgithub01.walmart.com>
11561b119eb65e67e66834677958c9c4c9747ec6
--- .looper.multibranch.yml @@ -56,7 +56,7 @@ envs: - extras;android;m2repository - extras;google;m2repository - TARGET_XCODE: "13.0" + TARGET_XCODE: "13" RCT_NO_LAUNCH_PACKAGER: true PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true EXTRA_PACKAGER_ARGS: "--sourcemap-output /tmp/index.ios.js.map" @@ -497,7 +497,6 @@ flows: - (name looper prebuild clean) ./BuildSupport/looper-clean.sh - (name looper credentials) ./BuildSupport/looper-credentials.sh - call: cocoapods-install -# - (name prepare xcode) bundle exec fastlane set_xcodeversion version:$TARGET_XCODE cocoapods-install: - dir(ios): @@ -515,9 +514,8 @@ flows: fi exit 0 - (name cocoapods setup) ./BuildSupport/install-cocoapods.sh - - (name prepareXcode) sudo xcode-select -s /Applications/xcode_version/Xcode_13.app/Contents/Developer/ -# - (name prepare xcode) bundle exec fastlane set_xcodeversion version:$TARGET_XCODE -# - (name prepare xcode) bundle exec fastlane run xcversion version:"13.0" + - (ls) ls -ltr /Applications/xcode_version/ + - (name prepareXcode) sudo xcode-select -s /Applications/xcode_version/Xcode_$TARGET_XCODE.app/Contents/Developer/ # performs the ios build for the given env # --- fastlane/Fastfile @@ -33,11 +33,6 @@ lane :set_android do |values| ) end -desc 'Set xcode version' -lane :set_xcodeversion do |values| - xcode_select('/Applications/xcode_version/Xcode_13.app/Contents/Developer/') -end - desc 'Evaluate and Set Build Number and Version Code' lane :set_build do version_json = read_json(json_path: "#{VERSION_PATH}")
add dynamic xcode
add dynamic xcode
f0f6457c285ed5cc79118c6b2decba7cb238108c
--- packages/associate-exp-hub-team-switcher/src/components/header/LocalHeader.tsx @@ -20,6 +20,8 @@ import {TeamSwitcherTranslationClient} from '../../utils/translation'; interface LocalHeaderProps { /** React nodes to render within the header container */ children: React.ReactNode; + /** Optional testID for testing purposes */ + testID?: string; } /** @@ -32,11 +34,12 @@ interface LocalHeaderProps { * @param children - React nodes to render within the header * @returns JSX element representing the header */ -export const LocalHeader: React.FC<LocalHeaderProps> = ({children}) => { +export const LocalHeader: React.FC<LocalHeaderProps> = ({children, testID = 'local-header'}) => { const [translate] = TeamSwitcherTranslationClient.useTranslation(); return ( <View + testID={testID} accessible accessibilityRole='header' accessibilityLabel={translate('accessibilityLabels.appHeader')} --- packages/associate-exp-hub-team-switcher/src/components/hoc/withHeader.tsx @@ -81,8 +81,12 @@ export function withHeader<P extends object>( * The actual HOC component that wraps with LocalHeader */ const WithHeaderComponent: ComponentType<P> = (props: P) => { + // Extract testID from props if available (works for components with testID) + const propsWithTestID = props as P & { testID?: string }; + const baseTestID = propsWithTestID.testID || 'component-with-header'; + return ( - <LocalHeader {...additionalHeaderProps}> + <LocalHeader {...additionalHeaderProps} testID={`${baseTestID}-header`}> <WrappedComponent {...props} /> </LocalHeader> ); --- packages/associate-exp-hub-team-switcher/src/components/team-switcher/MyWalmartTeamSwitcher.tsx @@ -19,14 +19,27 @@ * @module @walmart/associate-exp-hub-team-switcher/components/team-switcher * @since 2.0.0 */ +import React from 'react'; import {MyWalmartTeamSwitcherFilter, type TeamSwitcherProps} from './MyWalmartTeamSwitcherFilter'; import {withHeader} from '../hoc/withHeader'; +// Base component with header +const MyWalmartTeamSwitcherWithHeaderBase = withHeader<TeamSwitcherProps>(MyWalmartTeamSwitcherFilter); + /** * MyWalmartTeamSwitcher Component * * A pre-wrapped version of MyWalmartTeamSwitcherFilter with the LocalHeader component. * This component maintains all the props and functionality of the original * MyWalmartTeamSwitcherFilter while providing a consistent header appearance. + * + * @default testID - 'team-switcher-with-header' when not provided + * + * Test IDs: + * - Main wrapper: testID prop (default: 'team-switcher-with-header') + * - Header: `${testID}-header` + * - Filter component: `${testID}-filter` */ -export const MyWalmartTeamSwitcher = withHeader<TeamSwitcherProps>(MyWalmartTeamSwitcherFilter); +export const MyWalmartTeamSwitcher: React.FC<TeamSwitcherProps> = (props) => { + return <MyWalmartTeamSwitcherWithHeaderBase testID='team-switcher-with-header' {...props} />; +}; --- packages/associate-exp-hub-team-switcher/src/components/team-switcher/MyWalmartTeamSwitcherFilter.tsx @@ -81,6 +81,8 @@ export interface TeamSwitcherProps { customStyles?: any; /** Optional max time between team switches in ms (defaults to 2000ms) */ throttleTime?: number; + /** Optional testID for testing purposes */ + testID?: string; } /** @@ -127,6 +129,7 @@ const MyWalmartTeamSwitcherComponent: React.FC<TeamSwitcherProps> = ({ refreshing = false, customStyles, throttleTime = 2000, + testID = 'team-switcher', }: TeamSwitcherProps) => { // Hook to detect if this component instance should be active const useComponentActivity = () => { @@ -705,6 +708,7 @@ const MyWalmartTeamSwitcherComponent: React.FC<TeamSwitcherProps> = ({ return ( <View + testID={testID} accessible accessibilityRole='button' accessibilityLabel={`Switch team. Current: ${displayTeamName}. ${isSiteDC && selectedShifts.length > 0 ? `Shifts: ${selectedShifts.join(', ')}. ` : ''}Tap to change.`} @@ -714,7 +718,7 @@ const MyWalmartTeamSwitcherComponent: React.FC<TeamSwitcherProps> = ({ }} > <TeamSwitcherFilter - testID='team-switcher-filter' + testID={`${testID}-filter`} teamName={displayTeamName} teamImageUri={displayTeamImage} onPress={handleTeamPress}
feat(ui): update packages json
feat(ui): update packages json
277a1440e1aa8e8591bbe795cd4d458f5f899c4b
--- docs/CHANGELOG.md @@ -1,3 +1,10 @@ +# [2.7.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.6.0...v2.7.0) (2024-07-08) + + +### Features + +* **ui:** update mini app version SMDV-5955 ([7403da8](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/7403da82e07b3e00252c077df6e44a83e0f92c62)) + # [2.6.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.5.0...v2.6.0) (2024-06-26) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.6.0", + "version": "2.7.0", "main": "dist/index.js", "files": [ "dist"
chore(release): 2.7.0 [skip ci]
chore(release): 2.7.0 [skip ci] # [2.7.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.6.0...v2.7.0) (2024-07-08) ### Features * **ui:** update mini app version SMDV-5955 ([7403da8](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/7403da82e07b3e00252c077df6e44a83e0f92c62))
bee0b4d6f7e854d011bd04c65d7e53093c249d84
--- targets/US/package.json @@ -150,7 +150,7 @@ "@walmart/store-feature-orders": "1.27.9", "@walmart/taskit-mini-app": "5.8.17", "@walmart/time-clock-mini-app": "2.462.0", - "@walmart/time-clock-mini-app-next": "2.810.0", + "@walmart/time-clock-mini-app-next": "2.812.0", "@walmart/topstock-mini-app": "1.20.4", "@walmart/translator-mini-app": "1.4.2", "@walmart/ui-components": "1.21.2", --- yarn.lock @@ -7447,7 +7447,7 @@ __metadata: "@walmart/store-feature-orders": "npm:1.27.9" "@walmart/taskit-mini-app": "npm:5.8.17" "@walmart/time-clock-mini-app": "npm:2.462.0" - "@walmart/time-clock-mini-app-next": "npm:2.810.0" + "@walmart/time-clock-mini-app-next": "npm:2.812.0" "@walmart/topstock-mini-app": "npm:1.20.4" "@walmart/translator-mini-app": "npm:1.4.2" "@walmart/ui-components": "npm:1.21.2" @@ -8430,9 +8430,9 @@ __metadata: languageName: node linkType: hard -"@walmart/time-clock-mini-app-next@npm:2.810.0": - version: 2.810.0 - resolution: "@walmart/time-clock-mini-app-next@npm:2.810.0" +"@walmart/time-clock-mini-app-next@npm:2.812.0": + version: 2.812.0 + resolution: "@walmart/time-clock-mini-app-next@npm:2.812.0" dependencies: "@react-navigation/elements": "npm:^1.3.1" moment-timezone: "npm:0.5.33" @@ -8478,7 +8478,7 @@ __metadata: uuid: ^3.3.2 wifi-store-locator: ^1.4.0 xdate: ^0.8.2 - checksum: 10c0/f4753e6765428fc8eff5c23ad4eac33aa5ea05680a78af0cab3a940942d1c3f3c86c061ddbb61b050a606def5381b915e25a782ebb531ebb948bbe5da563e1c6 + checksum: 10c0/c68f1d60fb1dc52160a777d9fe95e115330849003a53efa4459af40d2971d0a9e70a33da6973f2e1938ed8d86cb01b323335d46b90646b3e180c62650efe472a languageName: node linkType: hard
GTA-158962 Change startup action names
GTA-158962 Change startup action names
4912d6bf5b2b4431ab9852f2f6ce1fadf72aebb9
--- packages/me-at-walmart-container/src/services/logger.ts @@ -126,7 +126,10 @@ export class LoggerClientManager { config?: FoundationLoggerConfig & TConfig ) => { const existing = this._instances.get(id); - if (existing) return existing; + if (existing) { + existing.configure(config); + return existing; + } const instance = new LoggerClient(id, config); this._instances.set(id, instance);
feat: reconfigure feature logger on multiple calls to create feature instance
feat: reconfigure feature logger on multiple calls to create feature instance
85341263445d149c9aa1ccdc86637de692947d1d
--- __tests__/__mocks__/@walmart/core-services/Environment.js @@ -1,4 +0,0 @@ -module.exports = { - ...jest.requireActual('@walmart/core-services/Environment'), - useEnvironment: jest.fn(), -};
removing unused file
removing unused file
057383d53c92ca1e91d7c817f96c8e9c69648140
--- packages/allspark-foundation/__mocks__/data/teamSelection.ts @@ -1,9 +1,9 @@ import { Area, Team, -} from '../../src/Components/Onboarding/TeamSelection/types'; +} from '../../src/HubFeature/Onboarding/TeamSelection/types'; -export const allAreas: Area[] = [ +export const allAreas: Area = [ 'Admin & Support', 'Digital', 'Food & Consumables', --- packages/allspark-foundation/src/HubFeature/Hub/Container/AllsparkHubContainer.tsx @@ -11,13 +11,18 @@ import { useSelector } from 'react-redux'; import { validateWidgets } from './utils'; import { ValidatedTeamWidgetMapping } from './types'; import { LayoutConfig } from '@walmart/allspark-utils'; -import { AllsparkFeatureModule, useAllsparkTranslation } from '../../../Core'; +import { + AllsparkFeatureModule, + UserSelectors, + useAllsparkTranslation, +} from '../../../Core'; import { enUS, esMX } from '../../translation'; import { useUserPreferences } from '../../Hooks/useUserPreferences'; import { ScrollView } from 'react-native'; import { FEATURE_ID, FEATURE_NAME } from '../../constant'; import { TeamSelection } from '../../Onboarding/TeamSelection'; import { managerExperienceSlice } from '../../Redux/reducer'; +import { ManagerExperienceSelectors } from '../../Redux/selectors'; export const managerExperienceFeature = new AllsparkFeatureModule(FEATURE_ID, { name: FEATURE_NAME, @@ -80,6 +85,10 @@ export class AllsparkHubContainer { ); const { teamData, loading } = useUserPreferences([]); const { t } = useAllsparkTranslation(FEATURE_ID); + const storeId = useSelector(UserSelectors.getSiteId); + const selectedTeamIds = useSelector( + ManagerExperienceSelectors.getSelectedTeamData + ); useEffect(() => { this.allowedWidgets = Object.keys(this.validWidgets).includes(teamId) @@ -109,7 +118,11 @@ export class AllsparkHubContainer { <this.AllsparkWidgetContainer.Layout layout={allowedWidgetsList} - props={{ teamId: teamId }} + props={{ + selectedTeamPreference: teamId, + selectedTeamIds: selectedTeamIds, + storeNumber: storeId, + }} /> </ScrollView> ); --- packages/allspark-foundation/src/HubFeature/Hub/Container/mockData.ts @@ -52,8 +52,8 @@ export const Images = { }; export const teamImageIcon: Record<string, string> = { - 'total': 'total', - 'myTeams': 'myTeams', + 'total': Images.totalStore, + 'myTeams': Images.myTeams, '1000100': Images.adminAndSupport, '1000282': Images.apparel, '1000101': Images.assetProtection, --- packages/allspark-foundation/src/HubFeature/Hub/HubWidget/index.tsx @@ -21,10 +21,12 @@ export const HubWidget = ({ infoText, isActionBtnDisabled, variant, + ...rest }: HubWidgetTypes) => { const styles = HubWidgetStyles(); const IconComponent = Icons[iconName]; const showShortIntro = shortIntro && variant !== 'restricted'; + console.log('Rest props: ', rest); return ( <View style={styles.container}> --- packages/allspark-foundation/src/HubFeature/Hub/TeamSwitcher/index.tsx @@ -24,16 +24,42 @@ export const TeamSwitcher = ({ const TeamImage = useTeamHubImage(); const dispatch = useDispatch(); - useEffect(() => { - if (teamData && teamData.length > 0) { - setSelectedTeam(teamData[0].teamLabel); + const getTeamsData = useCallback(() => { + const totalStore = { + teamId: 'total', + teamLabel: 'Total store', + teamImage: teamImageIcon.total, + }; + const myTeams = { + teamId: 'myTeams', + teamLabel: 'My teams', + teamImage: teamImageIcon.myTeams, + }; + if (teamData.length > 0) { + return [totalStore, myTeams, ...teamData]; } + return [totalStore, ...teamData]; }, [teamData]); + useEffect(() => { + const teamDataPreference = getTeamsData(); + if (teamDataPreference && teamDataPreference.length > 0) { + setSelectedTeam(teamDataPreference[0].teamLabel); + } + }, [getTeamsData]); + const handlePress = (teamId: string, teamLabel: string) => { setSelectedTeam(teamLabel); onTeamChange(teamId); dispatch(ManagerExperienceCreators.updateSelectedTeamPreference(teamId)); + if (teamId === 'myTeams') { + const selectedTeamsList = teamData.map((team) => team.teamId); + dispatch( + ManagerExperienceCreators.updateSelectedTeamData(selectedTeamsList) + ); + } else { + dispatch(ManagerExperienceCreators.updateSelectedTeamData([teamId])); + } }; const handleAddEditPress = () => console.log('Add/Edit button pressed'); @@ -102,7 +128,7 @@ export const TeamSwitcher = ({ <View style={styles.container}> <FlatList testID='team-switcher-list' - data={teamData} + data={getTeamsData()} renderItem={renderTeamItem} keyExtractor={keyExtractor} horizontal={true} --- packages/allspark-foundation/src/HubFeature/Onboarding/TeamSelection/Component/TeamSelectionList.tsx @@ -69,7 +69,8 @@ export const TeamSelectionList = ({ }, }); //TODO: Add confirmation screen navigation - AllsparkNavigationClient.navigate('managerExperience.hubContainer'); + // AllsparkNavigationClient.navigate('managerExperience.hubContainer'); + AllsparkNavigationClient.navigate('teamHub.container'); }; return ( --- packages/allspark-foundation/src/HubFeature/Redux/reducer.ts @@ -5,6 +5,7 @@ import { FEATURE_ID } from '../constant'; export const INITIAL_STATE: ManagerExperienceState = { selectedTeamPreference: '', + selectedTeamData: [], }; export const managerExperienceSlice = createSlice({ @@ -14,5 +15,8 @@ export const managerExperienceSlice = createSlice({ updateSelectedTeamPreference: (state, action: PayloadAction<string>) => { state.selectedTeamPreference = action.payload; }, + updateSelectedTeamData: (state, action: PayloadAction<string[]>) => { + state.selectedTeamData = action.payload; + }, }, }); --- packages/allspark-foundation/src/HubFeature/Redux/types.ts @@ -1,3 +1,4 @@ export interface ManagerExperienceState { selectedTeamPreference: string; + selectedTeamData: string[]; }
feat(ui): redux updates for manager experience hub
feat(ui): redux updates for manager experience hub
5a14a14447965b0d4c77186b373d54a121408248
--- .looper-pr.yml @@ -30,3 +30,4 @@ envs: SLACK_CHANNEL: 'smdv-miniapp' +
feat(ui): update concord SMDV-9999
feat(ui): update concord SMDV-9999
8ec50aa3ef9348529e5b026524c6da83befaa483
--- packages/allspark-foundation-hub/src/HubFeature/Hub/Container/utils.ts @@ -68,13 +68,25 @@ export const getDefaultTeamsForUserType = ( ) => { const primaryTeam = userTeams?.[0]; if (empType === EMP_TYPE_SALARIED) { - return [ - { - teamId: MANAGEMENT_TEAMID, - teamLabel: MANAGEMENT_TEAMLABEL, - teamImage: Images[MANAGEMENT_TEAMID], - }, - ]; + if (primaryTeam) { + return [ + { + teamId: primaryTeam.teamId ?? '', + teamLabel: primaryTeam.teamName ?? '', + teamImage: primaryTeam.teamId + ? Images[primaryTeam.teamId] + : Images['0000000'], + }, + ]; + } else { + return [ + { + teamId: MANAGEMENT_TEAMID, + teamLabel: MANAGEMENT_TEAMLABEL, + teamImage: Images[MANAGEMENT_TEAMID], + }, + ]; + } } else if (empType === EMP_TYPE_HOURLY && primaryTeam) { return [ { --- packages/allspark-foundation-hub/src/HubFeature/Hub/TeamSwitcher/index.tsx @@ -102,7 +102,7 @@ export const TeamSwitcher = ({ } else if (isOffSite && empType === EMP_TYPE_HOURLY) { evaluatedTeamList = [totalStore, ...allTeamsOfStore]; evaluatedSelectTeam = totalStore; - } else if (userPrefTeams) { + } else if (userPrefTeams && userPrefTeams.length > 1) { const primaryTeam = userTeams?.[0]; evaluatedTeamList = [ totalStore,
Update team preference changes
Update team preference changes
5aed14e01ba69afde7c7550bf0e4cc1ad56f81b8
--- src/core/httpClientInit.ts @@ -7,11 +7,8 @@ export const createRefreshTokenCallback = (sso: ConnectedSSO) => async ( request: any, ) => { try { - console.log('token 11111'); const token = await sso.getFreshAccessToken(); - console.log('token 22222', token); request.headers.authorization = `Bearer ${token}`; - console.log('token 33333', request.headers); return request; } catch (err) { console.warn('error while refreshing token; signing out', err);
removing console.logs
removing console.logs
0f50461edb62192c27bb07ef8c2f57cb3cc24680
--- package-lock.json @@ -3269,9 +3269,9 @@ } }, "@walmart/ui-components": { - "version": "1.1.24", - "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.1.24.tgz", - "integrity": "sha512-XrhDBPU75eJ8QqqOvCVEmUerWuioC+/bUz5+ySNxNKcflJB7btm90RVtFMdtiRa4FAAoukygJK9lXsltBuzM4g==", + "version": "1.1.26", + "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.1.26.tgz", + "integrity": "sha512-LhMDHE4KY81ueb7z33syj+JpPOUH2QHZPZvxG3yLuJPng2XS/pbasy0ctZMYtqM1qrlhI2thA7OH3fm+66ryzw==", "requires": { "react-native-calendars": "1.299.0" } --- package.json @@ -87,7 +87,7 @@ "@walmart/schedule-mini-app": "0.2.76", "@walmart/settings-mini-app": "1.2.3", "@walmart/time-clock-mini-app": "0.3.4", - "@walmart/ui-components": "1.1.24", + "@walmart/ui-components": "1.1.26", "@walmart/welcomeme-mini-app": "0.24.0", "@walmart/wfm-ui": "^0.1.50", "axios-cache-adapter": "2.7.3", --- src/navigation/AssociateHallwayNav/SideMenuContent.tsx @@ -147,6 +147,7 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps< defaultLocale='en-US' locale={i18n.language} signOutText={translate('menu.signOutText')} + deviceType='BYOD' /> <Dialog testID='signoutDialog'
ui componetns bump
ui componetns bump
7db71fede56794ebe413c681f4968b2dc7527aed
--- packages/allspark-foundation/src/Navigation/components/AllsparkModal.tsx @@ -0,0 +1,66 @@ +import React, { + ComponentProps, + ComponentType, + useEffect, + useState, +} from 'react'; +import { BottomSheet, Modal } from '@walmart/gtp-shared-components'; +import { useAllsparkModal } from '../hooks'; + +export const withModalConnection = + <T extends ComponentType<any>>(ModalComponent: T) => + (props: ComponentProps<T>) => { + const { + children, + isOpen: parentIsOpen, + onClose: parentOnClose, + onClosed: parentOnClosed, + ...restProps + } = props; + const modal = useAllsparkModal(); + + const [open, setOpen] = useState(true); + + useEffect(() => { + if (parentIsOpen === false) { + onClose(); + } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [parentIsOpen]); + + const onClose = () => { + setOpen(false); + parentOnClose?.(); + }; + + const onClosed = () => { + modal.closeModal(); + parentOnClosed?.(); + }; + + return ( + // @ts-ignore + <ModalComponent + isOpen={open} + onClose={onClose} + onClosed={onClosed} + {...restProps} + > + {children} + </ModalComponent> + ); + }; + +/** + * AllsparkModal is a wrapper around GTP's Modal component. + * It connects GTP's Modal to the navigation client as a modal so the open/close state + * is kept in sync. + */ +export const AllsparkModal = withModalConnection(Modal); + +/** + * AllsparkBottomSheet is a wrapper around GTP's BottomSheet component. + * It connects GTP's BottomSheet to the navigation client as a modal so the open/close state + * is kept in sync. + */ +export const AllsparkBottomSheet = withModalConnection(BottomSheet); --- packages/allspark-foundation/src/Navigation/components/index.ts @@ -1,2 +1,3 @@ +export * from './AllsparkModal'; export * from './DrawerButton'; export * from './Header'; --- packages/allspark-foundation/src/Translation/modals/ChangeLanguageModal.tsx @@ -1,10 +1,11 @@ -import React, { useEffect, useState } from 'react'; +import React, { useState } from 'react'; import { StyleSheet } from 'react-native'; -import { BottomSheet, Radio } from '@walmart/gtp-shared-components'; +import { Radio } from '@walmart/gtp-shared-components'; import { SafeAreaView } from 'react-native-safe-area-context'; import { AllsparkModalComponent } from '../../Navigation/types'; import { AllsparkTranslationClient, useAllsparkTranslation } from '../index'; +import { AllsparkBottomSheet } from '../../Navigation'; const styles = StyleSheet.create({ radioButton: { @@ -20,8 +21,7 @@ const styles = StyleSheet.create({ * move to feature runner and have a container add them if needed * so you can opt in/out? May be too opinionated in UX. */ -export const ChangeLanguageModal: AllsparkModalComponent = (props) => { - const { modal } = props; +export const ChangeLanguageModal: AllsparkModalComponent = (_) => { const { i18n } = useAllsparkTranslation(); const [languages] = useState( AllsparkTranslationClient.getSupportedLanguages() @@ -29,26 +29,15 @@ export const ChangeLanguageModal: AllsparkModalComponent = (props) => { const [open, setOpen] = useState(true); - useEffect(() => { - if (!open) { - modal.closeModal(); - } - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [open]); - - const close = () => setOpen(false); - const onChangeLanguage = (lng: string) => { AllsparkTranslationClient.changeLanguage(lng); setTimeout(() => setOpen(false), 250); }; return ( - <BottomSheet - showCloseHandle + <AllsparkBottomSheet isOpen={open} - onClose={close} - // onClosed={handleModalOnClosed} + showCloseHandle title='Choose your preferred language' > <SafeAreaView edges={['bottom']}> @@ -66,6 +55,6 @@ export const ChangeLanguageModal: AllsparkModalComponent = (props) => { /> ))} </SafeAreaView> - </BottomSheet> + </AllsparkBottomSheet> ); };
feat: add allspark modal and bottomsheet components for easier integration of gtps same components
feat: add allspark modal and bottomsheet components for easier integration of gtps same components
cfe9b89d599ca6ddc2461cde69a8676fce25b9b0
--- CHANGELOG.md @@ -3,6 +3,42 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.27.0](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v6.26.0...v6.27.0) (2025-01-14) + + +### Bug Fixes + +* ADA fix for SitePrompt for RECRUIT-88829 ([7ca58e0](https://gecgithub01.walmart.com/allspark/allspark-core/commit/7ca58e0994747f9f8cace99e78efe3e0ac7fbd65)) +* add spanish translation ([3cce320](https://gecgithub01.walmart.com/allspark/allspark-core/commit/3cce32078c423334046db445dff32a9f1eb913c6)) +* adding drawer button label translations for ada ([554b125](https://gecgithub01.walmart.com/allspark/allspark-core/commit/554b12591c923eb69f444ddbf193fc44d771ce3f)) +* bump foundation to use override nav config action for rbac ([544291c](https://gecgithub01.walmart.com/allspark/allspark-core/commit/544291c3557c336d543b40c385c86768a85575f5)) +* bumping version of ui-components for additional ADA fixes ([e49c6b1](https://gecgithub01.walmart.com/allspark/allspark-core/commit/e49c6b102872ade069907c4fe74e3a356423ef2e)) +* changed translations for drawerButton ([ee2334c](https://gecgithub01.walmart.com/allspark/allspark-core/commit/ee2334c8badd0743e65d33122c01ccbf1f6e8270)) +* language fix for - and _ ([49231cc](https://gecgithub01.walmart.com/allspark/allspark-core/commit/49231cc13bfef16fb1d65150faab2cca70a19411)) +* patching foundation ([0bcffdd](https://gecgithub01.walmart.com/allspark/allspark-core/commit/0bcffddb4d8e0603b06302d42782ea8adb0e449c)) +* removing patch for boost ([abfab09](https://gecgithub01.walmart.com/allspark/allspark-core/commit/abfab09395acf14c12f4deb090c64a4d2e5095d6)) +* revert gtp-shared-components version to 2.2.4 ([40eb1e6](https://gecgithub01.walmart.com/allspark/allspark-core/commit/40eb1e6aa1c047660b8d5e1f72941625636c9a2d)) +* sign in page button fixes, drawerButton translations ([d0e72af](https://gecgithub01.walmart.com/allspark/allspark-core/commit/d0e72af9ca5f55366191a4371fb6801157a15400)) +* sometimes device can return a language string with additional info. Fixing that and also defaulting to en-US ([156b000](https://gecgithub01.walmart.com/allspark/allspark-core/commit/156b000bec881edd5941254b9be0a660aab9f0b8)) +* two patches for fixing the 'Unlabelled' issue with the react-native-modal library ([15ecb0a](https://gecgithub01.walmart.com/allspark/allspark-core/commit/15ecb0ae08f0dd00acc129a6a76897a2a73c7b64)) +* updated patch for ui-components for Number Keypad ada fix ([a985989](https://gecgithub01.walmart.com/allspark/allspark-core/commit/a985989fd2574f4ea339b1a0907bd69d34b80b44)) +* updated snapshots ([634e2f0](https://gecgithub01.walmart.com/allspark/allspark-core/commit/634e2f0656c8b245115bd02992be1f9497b1ddec)) +* updating AuthenticatorView labels ([7abb2ef](https://gecgithub01.walmart.com/allspark/allspark-core/commit/7abb2efe52e41ce0897b30b9d3d8ce8968730334)) +* upgrade foundation for dynamic component fix ([beb1557](https://gecgithub01.walmart.com/allspark/allspark-core/commit/beb155777c3c7533b4ca62b0a5cfe152dce6cb8d)) +* upgrade foundation for feature connect timing fix ([22d0b8a](https://gecgithub01.walmart.com/allspark/allspark-core/commit/22d0b8aa59e8ed3b23c71850a341048782b60613)) + + +### Features + +* allspark-4758 - updated query mapping with new fields for w+ mini app ([539a217](https://gecgithub01.walmart.com/allspark/allspark-core/commit/539a217fcffffeeea3ce90be50ee5ec7d8d5900e)) +* bump version of gtp-shared-components to 2.2.5 ([b9ff37b](https://gecgithub01.walmart.com/allspark/allspark-core/commit/b9ff37b05f5a53d5071c9f89c35869182440c0d1)) +* bump version of gtp-shared-components to enable mini apps to resolve ada issues ([a1af652](https://gecgithub01.walmart.com/allspark/allspark-core/commit/a1af6523790b64a1856c1ff8cfa20f70ca480d5b)) +* bump version of ui-components to replace patch ([030c242](https://gecgithub01.walmart.com/allspark/allspark-core/commit/030c242be82417ccaddd39d61764846f0ee84944)) + + + + + # [6.26.0](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v6.25.1...v6.26.0) (2025-01-14) --- lerna.json @@ -1,5 +1,5 @@ { - "version": "6.26.0", + "version": "6.27.0", "npmClient": "yarn", "changelogPreset": "angular", "command": { --- packages/core-services-allspark/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. +# [6.27.0](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/v6.26.0...v6.27.0) (2025-01-14) + +**Note:** Version bump only for package @walmart/core-services-allspark + + + + + # [6.26.0](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/v6.25.1...v6.26.0) (2025-01-14) **Note:** Version bump only for package @walmart/core-services-allspark --- packages/core-services-allspark/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services-allspark", - "version": "6.26.0", + "version": "6.27.0", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", --- packages/me-at-walmart-container/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.27.0](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v6.26.0...v6.27.0) (2025-01-14) + + +### Features + +* allspark-4758 - updated query mapping with new fields for w+ mini app ([539a217](https://gecgithub01.walmart.com/allspark/allspark-core/commit/539a217fcffffeeea3ce90be50ee5ec7d8d5900e)) + + + + + # [6.26.0](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v6.25.1...v6.26.0) (2025-01-14) --- packages/me-at-walmart-container/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart-container", - "version": "6.26.0", + "version": "6.27.0", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts",
chore(version): updating package version
chore(version): updating package version