commit_hash
stringlengths
40
40
input
stringlengths
13
7.99k
output
stringlengths
5
155
full_message
stringlengths
6
8.96k
71b412de6d1706358673e0e1a3195dd807b6a338
--- targets/US/package.json @@ -108,7 +108,7 @@ "@walmart/global-vpi-mini-app": "1.1.1", "@walmart/gta-react-native-calendars": "0.7.0", "@walmart/gtp-shared-components": "2.2.7-rc.0", - "@walmart/ims-print-services-ui": "2.16.4", + "@walmart/ims-print-services-ui": "2.17.3", "@walmart/inbox-mini-app": "0.97.13", "@walmart/iteminfo-mini-app": "8.0.4", "@walmart/learning-mini-app": "20.0.41", --- yarn.lock @@ -6897,9 +6897,9 @@ __metadata: languageName: node linkType: hard -"@walmart/ims-print-services-ui@npm:2.16.4": - version: 2.16.4 - resolution: "@walmart/ims-print-services-ui@npm:2.16.4" +"@walmart/ims-print-services-ui@npm:2.17.3": + version: 2.17.3 + resolution: "@walmart/ims-print-services-ui@npm:2.17.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fims-print-services-ui%2F-%2Fims-print-services-ui-2.17.3.tgz" peerDependencies: "@react-native-firebase/analytics": ">=10.5.1" "@react-native-firebase/app": ">=10.5.0" @@ -6907,10 +6907,10 @@ __metadata: "@react-native-firebase/firestore": ">=10.5.1" "@react-native-firebase/perf": ">=10.5.1" "@react-navigation/native": ">=6.0.0" - "@walmart/functional-components": ">=1.0.22" + "@walmart/allspark-foundation": "*" "@walmart/gtp-shared-components": ">=2.0.6" "@walmart/react-native-logger": ">=1.17.0" - "@walmart/react-native-scanner-3.0": ">=0.3.0" + "@walmart/react-native-scanner-3.0": ">=0.6.0" "@walmart/ui-components": ">=1.1.11" i18next: ">=22.0.1" moment: ">=2.29.4" @@ -6920,7 +6920,7 @@ __metadata: react-native-segmented-control-tab: ">=4.0.0" react-native-wm-telemetry: ">=0.2.0" uuid: ">=3.3.2" - checksum: 10c0/b0ef161d32554ff70a56a0ca90bc2816386aabcb2602a4f0d1cdf6b63ecab710f0cf4d769cfc6fd5374981839bfa458bb34681a0ba7b9ae11c85d363224014d4 + checksum: 10c0/98c4ff17f880471ec8493f6f1e9e52dc44c9ebcee0be0be38bd45d8082dd3a62b5971acca1789f16b735494e2185639d899c593a25132a375d8e59416fa3157f languageName: node linkType: hard @@ -7449,7 +7449,7 @@ __metadata: "@walmart/global-vpi-mini-app": "npm:1.1.1" "@walmart/gta-react-native-calendars": "npm:0.7.0" "@walmart/gtp-shared-components": "npm:2.2.7-rc.0" - "@walmart/ims-print-services-ui": "npm:2.16.4" + "@walmart/ims-print-services-ui": "npm:2.17.3" "@walmart/inbox-mini-app": "npm:0.97.13" "@walmart/iteminfo-mini-app": "npm:8.0.4" "@walmart/learning-mini-app": "npm:20.0.41"
Bump Print UI to v2.17.3
Bump Print UI to v2.17.3
b1efd4deb133d78fb09cda428e0f6d6b9124594a
--- packages/allspark-foundation-hub/__tests__/HubFeature/supplyChain/ShiftFilterList.test.tsx @@ -0,0 +1,63 @@ +jest.useFakeTimers(); +import React from 'react'; +import { fireEvent } from '@testing-library/react-native'; +import { render } from '@walmart/allspark-foundation/__tests__/utils'; +import { ShiftFilterList } from '@walmart/allspark-foundation-hub/src/HubFeature/SupplyChain/Components/ShiftFilter/ShiftFilterList'; + +jest.mock('@walmart/allspark-foundation/Logger', () => ({ + ...jest.requireActual('@walmart/allspark-foundation/Logger'), + LoggerService: { + getContainerInstance: jest.fn().mockImplementationOnce(() => ({ + info: jest.fn(), + error: jest.fn(), + })), + }, +})); + +jest.mock('@walmart/allspark-foundation/Telemetry', () => ({ + ...jest.requireActual('@walmart/allspark-foundation/Telemetry'), + useTelemetryService: jest.fn().mockImplementationOnce(() => ({ + logEvent: jest.fn(), + })), +})); + +describe('ShiftFilterList', () => { + afterEach(() => { + jest.clearAllMocks(); + }); + + const mockShiftFilterListProps: ShiftFilterListProps = { + filterListData: [ + { + shiftId: 'shift1', + teamImage: { + uri: 'http://example.com/image1.jpg', + }, + }, + { + shiftId: 'shift2', + teamImage: { + uri: 'http://example.com/image2.jpg', + }, + }, + { + shiftId: 'shift3', + }, + ], + handleSelectShift: jest.fn(), + }; + it('Test 1: Renders ShiftFilterList component with required elements correctly', () => { + const { getByTestId, toJSON } = render( + <ShiftFilterList {...mockShiftFilterListProps} /> + ); + + expect(getByTestId('hub-header-title')).toBeTruthy(); + expect(getByTestId('hub-header-subText')).toBeTruthy(); + + expect(getByTestId('shift-filter-shift1')).toBeTruthy(); + expect(getByTestId('shift-filter-shift2')).toBeTruthy(); + expect(getByTestId('shift-filter-shift3')).toBeTruthy(); + + expect(toJSON()).toMatchSnapshot(); + }); +});
Adding Test 1 for shiftFilterList
Adding Test 1 for shiftFilterList
4284a8b0868f76eb0e6156c67195880e42f010f8
--- package-lock.json @@ -3088,9 +3088,9 @@ "integrity": "sha512-LveEdSxJy0V8cEmS3xS22gsVYtqS+T/e9hrZxkxCgVV5O12UFv8dSrfDkIuQ/WMzuijIf5yTlLOxRPjf0dDRdg==" }, "@walmart/inbox-mini-app": { - "version": "0.0.55", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.0.55.tgz", - "integrity": "sha512-Qv+TY8tK7wC5Hzyjql/PSzldPG8+cukQL0VCBWTWrHzJWTRxq+4mcJ1GgpXFSHHBZ/Zn0uj8IODZLB1l4B47pg==" + "version": "0.0.56", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.0.56.tgz", + "integrity": "sha512-HDdRnxyM1J4nQTElLJ7vS+svO5SxYqPWtCiWV2V//cjLXzM/u5tjO3whmDpJsSn7CZoq8r69BUQxEHH1tqaPXQ==" }, "@walmart/moment-walmart": { "version": "1.0.4", --- package.json @@ -56,7 +56,7 @@ "@walmart/functional-components": "1.0.24", "@walmart/gtp-shared-components": "^0.2.2", "@walmart/impersonation-mini-app": "1.0.12", - "@walmart/inbox-mini-app": "0.0.55", + "@walmart/inbox-mini-app": "0.0.56", "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.3.7", "@walmart/react-native-env": "^0.1.0",
Version Bump Inbox mini app (#392)
Version Bump Inbox mini app (#392) Co-authored-by: Hitesh Arora - h0a006n <Hitesh.Arora@walmart.com>
4a8dccd2b485f40fe733ee15fffcce59a525ba26
--- package.json @@ -58,7 +58,8 @@ "@react-native-firebase/firestore": "~22.4.0", "react": "19.0.0", "react-native": "0.79.5", - "graphql": "^16.8.1" + "graphql": "^16.8.1", + "react-server-dom-webpack": "~19.0.1" }, "config": { "commitizen": { --- yarn.lock @@ -19598,18 +19598,18 @@ __metadata: languageName: node linkType: hard -"react-server-dom-webpack@npm:~19.0.0": - version: 19.0.0 - resolution: "react-server-dom-webpack@npm:19.0.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Freact-server-dom-webpack%2F-%2Freact-server-dom-webpack-19.0.0.tgz" +"react-server-dom-webpack@npm:~19.0.1": + version: 19.0.1 + resolution: "react-server-dom-webpack@npm:19.0.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Freact-server-dom-webpack%2F-%2Freact-server-dom-webpack-19.0.1.tgz" dependencies: acorn-loose: "npm:^8.3.0" neo-async: "npm:^2.6.1" webpack-sources: "npm:^3.2.0" peerDependencies: - react: ^19.0.0 - react-dom: ^19.0.0 + react: ^19.0.1 + react-dom: ^19.0.1 webpack: ^5.59.0 - checksum: 10c0/08f15b5c21f4ec46ebf7578c1c6e8e080270274e81e969dea958d33938970d56dedbc7d598a9588bbc76ad37c1c7c0f61f8caff8ac8fb6725c94de0a9dc488fd + checksum: 10c0/19833a18466e24f36857bdc85da64b32e5140e866215fbd4f59f915470446a2cb064ef4f594952ac480c13d8c4b54d1385e9b19de726c88c5580bbcde707b26a languageName: node linkType: hard
feat(ui): yarn install issue fix
feat(ui): yarn install issue fix
c18fbdca783c1d5b737fb5cbee58c307b1443679
--- graphql.yml @@ -103,24 +103,24 @@ applications: # queryTemplate: "packages/me-at-walmart-athena-queries/src/updateManagerExperiencePreference.graphql" # tags: # - "v1" - - name: "allspark-core-intl" - applicationKey: "ALLSPARK_APP_INTL" - description: "Core application for Me@Walmart International" - environments: - - name: "stg" - persistedQueries: - - name: "businessUnitByCountryAndNumber" - hash: "dc5adc0197a2bfd29b0ecc4ec5a255f44f8e0700a8a6916a834ec745574ab54d" - queryTemplate: "packages/me-at-walmart-athena-queries/src/businessUnitByCountryAndNumber.graphql" - tags: - - "v1" - - name: "getAssociateById" - hash: "0a06f624828f31fa5f8a13615385e1c3c4424732132e432655f4a45962a7fa22" - queryTemplate: "packages/me-at-walmart-athena-queries/src/getAssociateById.graphql" - tags: - - "v1" - - name: "getLoggedInUser" - hash: "0beb54411dbf4e0c72d8d94982d755e0559023bc5e2c174e356b42f1e07b22fd" - queryTemplate: "packages/me-at-walmart-athena-queries/src/getLoggedInUser.graphql" - tags: - - "v1" + - name: "allspark-core-intl" + applicationKey: "ALLSPARK_APP_INTL" + description: "Core application for Me@Walmart International" + environments: + - name: "stg" + persistedQueries: + - name: "businessUnitByCountryAndNumber" + hash: "dc5adc0197a2bfd29b0ecc4ec5a255f44f8e0700a8a6916a834ec745574ab54d" + queryTemplate: "packages/me-at-walmart-athena-queries/src/businessUnitByCountryAndNumber.graphql" + tags: + - "v1" + - name: "getAssociateById" + hash: "0a06f624828f31fa5f8a13615385e1c3c4424732132e432655f4a45962a7fa22" + queryTemplate: "packages/me-at-walmart-athena-queries/src/getAssociateById.graphql" + tags: + - "v1" + - name: "getLoggedInUser" + hash: "0beb54411dbf4e0c72d8d94982d755e0559023bc5e2c174e356b42f1e07b22fd" + queryTemplate: "packages/me-at-walmart-athena-queries/src/getLoggedInUser.graphql" + tags: + - "v1"
fix: spacing
fix: spacing
920cd634f7928b92c834f174238d3dfc36aa75d2
--- package.json @@ -92,7 +92,7 @@ "@walmart/calling-mini-app": "0.7.52", "@walmart/checkout-mini-app": "4.8.12", "@walmart/compass-sdk-rn": "6.2.17", - "@walmart/config-components": "4.8.1", + "@walmart/config-components": "4.8.2", "@walmart/core-services": "~6.5.2", "@walmart/core-services-allspark": "workspace:^", "@walmart/core-utils": "6.3.9", --- yarn.lock @@ -7596,9 +7596,9 @@ __metadata: languageName: node linkType: hard -"@walmart/config-components@npm:4.8.1": - version: 4.8.1 - resolution: "@walmart/config-components@npm:4.8.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fconfig-components%2F-%2F%40walmart%2Fconfig-components-4.8.1.tgz" +"@walmart/config-components@npm:4.8.2": + version: 4.8.2 + resolution: "@walmart/config-components@npm:4.8.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fconfig-components%2F-%2F%40walmart%2Fconfig-components-4.8.2.tgz" peerDependencies: "@react-native-firebase/app": ">=15.1.1" "@react-native-firebase/database": ">=15.1.1" @@ -7611,7 +7611,7 @@ __metadata: redux: ">=4.2.0" reduxsauce: ">=1" reselect: ">=4" - checksum: 10c0/a881038679a52c485f66908a15decc1983706eec47abecd8b3971892d6f1df0da17757a9888a08c8911f5580fd374d5f0e011c3c8428287a3944f12007a429d3 + checksum: 10c0/6c626c73dd84a412aeb73618a405d966ba2b60bbdbfd5f06dedef21a24eead210ad4e91a573384e21b80d5aab6c22bab553e186ede4ebaaa72b3d08d57484e30 languageName: node linkType: hard @@ -8265,7 +8265,7 @@ __metadata: "@walmart/calling-mini-app": "npm:0.7.52" "@walmart/checkout-mini-app": "npm:4.8.12" "@walmart/compass-sdk-rn": "npm:6.2.17" - "@walmart/config-components": "npm:4.8.1" + "@walmart/config-components": "npm:4.8.2" "@walmart/core-services": "npm:~6.5.2" "@walmart/core-services-allspark": "workspace:^" "@walmart/core-utils": "npm:6.3.9"
fix(deviceconfig): SSMP-9546 Cope Device Identification Logic Change (#4229)
fix(deviceconfig): SSMP-9546 Cope Device Identification Logic Change (#4229) * fix(device-config): SSMP-1234 deviceConfig * fix(deviceconfig): SSMP-1234 adding logs * fix(deviceconfig): SSMP-9546 Cope Device Identification Logic Change --------- Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com>
1d6058dd7bc6098e44a4a69e2196718dd0cf0e4f
--- targets/US/package.json @@ -136,7 +136,7 @@ "@walmart/react-native-shared-navigation": "~6.3.28", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.7.4", - "@walmart/react-native-webex-sdk": "0.8.9", + "@walmart/react-native-webex-sdk": "0.8.11", "@walmart/receipt-check-miniapp": "1.28.1", "@walmart/redux-store": "~6.3.28", "@walmart/returns-mini-app": "4.16.6", --- yarn.lock @@ -7462,7 +7462,7 @@ __metadata: "@walmart/react-native-shared-navigation": "npm:~6.3.28" "@walmart/react-native-store-map": "npm:0.3.7" "@walmart/react-native-sumo-sdk": "npm:2.7.4" - "@walmart/react-native-webex-sdk": "npm:0.8.9" + "@walmart/react-native-webex-sdk": "npm:0.8.11" "@walmart/receipt-check-miniapp": "npm:1.28.1" "@walmart/redux-store": "npm:~6.3.28" "@walmart/returns-mini-app": "npm:4.16.6" @@ -8083,14 +8083,14 @@ __metadata: languageName: node linkType: hard -"@walmart/react-native-webex-sdk@npm:0.8.9": - version: 0.8.9 - resolution: "@walmart/react-native-webex-sdk@npm:0.8.9" +"@walmart/react-native-webex-sdk@npm:0.8.11": + version: 0.8.11 + resolution: "@walmart/react-native-webex-sdk@npm:0.8.11::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freact-native-webex-sdk%2F-%2F%40walmart%2Freact-native-webex-sdk-0.8.11.tgz" peerDependencies: react: "*" react-native: "*" react-native-logger: "*" - checksum: 10c0/3ef637eb43e34c74b61db5b3d6240535f7c158a140ad3325aa39ecbc8122eb26525591ef4e026d56336b359a8397d5dd25076fec292b4b55b183130c4cfff847 + checksum: 10c0/9b323f9b4c417a9230057f8bfdbeef3dffe275958e624b2b6ea07eaa79dfa792e0d1d4bc5080a4794b0aafc62a5e76cdebb42276a157799e168908b511a3e60d languageName: node linkType: hard
Calling Webex SDK rebranding change for Call iOS native screen
Calling Webex SDK rebranding change for Call iOS native screen
f154c3f0a551f4ddf30bc2850f5151612bae74fa
--- package-lock.json @@ -46,7 +46,7 @@ "@walmart/counts-component-miniapp": "0.1.2", "@walmart/emergency-mini-app": "1.19.0", "@walmart/exception-mini-app": "1.0.16", - "@walmart/facilities-management-miniapp": "0.5.27", + "@walmart/facilities-management-miniapp": "0.5.29", "@walmart/feedback-all-spark-miniapp": "0.9.10", "@walmart/financial-wellbeing-feature-app": "1.1.2", "@walmart/functional-components": "2.0.6", @@ -5070,9 +5070,9 @@ } }, "node_modules/@walmart/facilities-management-miniapp": { - "version": "0.5.27", - "resolved": "https://npme.walmart.com/@walmart/facilities-management-miniapp/-/facilities-management-miniapp-0.5.27.tgz", - "integrity": "sha512-wAyu5l0mP5YEAueHA6aiZSnAVOqg/kfNwQ9PKma/7v43Er2PZOLhddx+kd7BV2FHma1aNkBiwsCFZ4dt4CQ5jQ==", + "version": "0.5.29", + "resolved": "https://npme.walmart.com/@walmart/facilities-management-miniapp/-/facilities-management-miniapp-0.5.29.tgz", + "integrity": "sha512-WySEXw+hvDaqen4Hhvuh0AE0izxPX44Xma2ksaobf4fS7uf2ei/XsqXEACZu4jUnfUTAaL3fMN5mui4zh+QJ1g==", "hasInstallScript": true, "peerDependencies": { "@react-native-community/async-storage": "^1.12.1", @@ -25325,9 +25325,9 @@ "integrity": "sha512-mzesUeNPUwAWFUrFs6104aZ3NCM5eXa2uD8TrjL+BV+ZVgYG/A58k1xUUxNayw26w7Z41J7m4bxA9ctgNiNVMQ==" }, "@walmart/facilities-management-miniapp": { - "version": "0.5.27", - "resolved": "https://npme.walmart.com/@walmart/facilities-management-miniapp/-/facilities-management-miniapp-0.5.27.tgz", - "integrity": "sha512-wAyu5l0mP5YEAueHA6aiZSnAVOqg/kfNwQ9PKma/7v43Er2PZOLhddx+kd7BV2FHma1aNkBiwsCFZ4dt4CQ5jQ==" + "version": "0.5.29", + "resolved": "https://npme.walmart.com/@walmart/facilities-management-miniapp/-/facilities-management-miniapp-0.5.29.tgz", + "integrity": "sha512-WySEXw+hvDaqen4Hhvuh0AE0izxPX44Xma2ksaobf4fS7uf2ei/XsqXEACZu4jUnfUTAaL3fMN5mui4zh+QJ1g==" }, "@walmart/feedback-all-spark-miniapp": { "version": "0.9.10", --- package.json @@ -88,7 +88,7 @@ "@walmart/counts-component-miniapp": "0.1.2", "@walmart/emergency-mini-app": "1.19.0", "@walmart/exception-mini-app": "1.0.16", - "@walmart/facilities-management-miniapp": "0.5.27", + "@walmart/facilities-management-miniapp": "0.5.29", "@walmart/feedback-all-spark-miniapp": "0.9.10", "@walmart/financial-wellbeing-feature-app": "1.1.2", "@walmart/functional-components": "2.0.6",
package update
package update
d12766e5e264e4b812cf3d2dd8bb0c8ca3987842
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/translation.ts @@ -7,6 +7,11 @@ export const enUS = { subText: "Shortcut to quickly view teams you're interested in. Edit anytime.", }, + shiftFilter: { + title: 'Pick your shift', + subText: + 'Shift A1 is selected by default, but you can change it at any time.', + }, }; export const esMX = { @@ -18,4 +23,9 @@ export const esMX = { subText: 'Acceso directo para ver rápidamente los equipos que te interesan. Edita en cualquier momento.', }, + shiftFilter: { + title: 'Elige tu turno', + subText: + 'El cambio A1 está seleccionado de forma predeterminada, pero puede cambiarlo en cualquier momento.', + }, };
Adding translations
Adding translations
866ac09ac879b09447e24d8e43577d1caf257938
--- __tests__/managerExperience/components/AssociateListItem.test.tsx @@ -5,10 +5,12 @@ import {AssociateListItem} from '../../../src/managerExperience/components/Assoc import {generateAssociateInitials} from '../../../src/managerExperience/utils/associateList'; import {generateMockAssociate} from '../../harness/mockData/associate'; import * as utils from '../../../src/utils/user'; -import * as hooks from '../../../src/hooks/roster'; +import * as hooks from '../../../src/hooks'; import {colors} from '@walmart/gtp-shared-components'; import {AssociateAvatar} from '../../../src/managerExperience/components/AssociateList/AssociateAvatar'; +jest.mock('../../../src/hooks'); + const mockObject = { firstName: 'Alex', preferredFirstName: 'Lexi', @@ -57,8 +59,9 @@ describe('AssociateListItem', () => { const winSpy = jest .spyOn(utils, 'encryptUserId') .mockReturnValue(mockObject.win.toString()); - const clockedInSpy = jest.spyOn(utils, 'associateIsClockedIn'); + jest.spyOn(hooks, 'useUserIsInRoster').mockReturnValue(true); + jest.spyOn(hooks, 'useIsImpersonatedOnDev').mockReturnValue(true); it('should render AssociateListItem with props', () => { const {toJSON} = renderWithProviders( --- __tests__/managerExperience/screens/RosterDetailScreen.test.tsx @@ -95,6 +95,7 @@ const mockNavigation = jest.fn(); describe('RosterDetailScreen', () => { beforeEach(() => { + jest.spyOn(hooks, 'useUserIsInRoster').mockReturnValue(true); jest.spyOn(hooks, 'useGetViewersPrimaryTeamId').mockReturnValue('1000333'); jest.spyOn(hooks, 'useRbacConfigWithJobCode').mockReturnValue(true); jest
feat: updated tests with new hook logic
feat: updated tests with new hook logic
60904d0c3c4cfcb0776bf4360d4f39f3a169c872
--- package-lock.json @@ -5434,9 +5434,9 @@ } }, "@walmart/payrollsolution_miniapp": { - "version": "0.127.7", - "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.127.7.tgz", - "integrity": "sha512-Q0xYJMstj5CjtQDs4nRYjbpYaBQpFebFVQbYu7MC8BAE8z6XrXzra5YrvZ1H1qNyMDd9xHJBbpSf3ewccIQ2GQ==", + "version": "0.129.0", + "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.129.0.tgz", + "integrity": "sha512-fhnYFQl+J5BQBbl8ElwK9cARJKi5pHWWft5Ugx3JCDfl9D59YlP9bJEjPRSY9xuiulgMsCkJ6vdVuxsULdCNmg==", "requires": { "crypto-js": "^3.3.0" } @@ -19938,9 +19938,9 @@ "integrity": "sha512-+4vPVbvtT+kRUtKIIJIjmL/bqefoUTAZ7CoiYhiwf+9zumrM+CxfVLmSGDwNtxjrOOfHQTXZhXf5TZO3nNVQZQ==" }, "react-native-webview": { - "version": "10.10.0", - "resolved": "https://npme.walmart.com/react-native-webview/-/react-native-webview-10.10.0.tgz", - "integrity": "sha512-T0AnZ0LVhaFBqZpl5attDDYo83zqdFRsFVINbrgHaIm6w5r0d/QK/dJRgXRNyFhn1fSONhe0ejdcnCYCT73B6g==", + "version": "10.7.0", + "resolved": "https://npme.walmart.com/react-native-webview/-/react-native-webview-10.7.0.tgz", + "integrity": "sha512-4TSYwJqMBUTKB9+xqGbPwx+eLXbp6RRD7lQ2BumT8eSTfuuqr2rXNqcrlKU1VRla7QGGYowmYmxl2aXIx5k9wA==", "requires": { "escape-string-regexp": "2.0.0", "invariant": "2.2.4" --- package.json @@ -103,7 +103,7 @@ "@walmart/mod-flex-mini-app": "1.2.4", "@walmart/moment-walmart": "1.0.4", "@walmart/pay-stub-miniapp": "0.8.6", - "@walmart/payrollsolution_miniapp": "^0.127.7", + "@walmart/payrollsolution_miniapp": "0.129.0", "@walmart/price-changes-mini-app": "1.5.5", "@walmart/profile-feature-app": "0.0.71", "@walmart/push-to-talk-mini-app": "1.8.15",
bump version
bump version
fdf6264b3a12d296bbc411e29331ffb488afafd9
--- ios/Podfile @@ -21,7 +21,8 @@ require Pod::Executable.execute_command('node', ['-p', setup_permissions([ 'Camera', 'LocationWhenInUse', - 'Notifications' + 'Notifications', + 'Microphone' ]) # If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set. --- ios/Podfile.lock @@ -1345,7 +1345,7 @@ PODS: - React-Core - react-native-view-shot (3.8.0): - React-Core - - react-native-webex-sdk (0.1.5): + - react-native-webex-sdk (0.1.8): - React-Core - SumoSDK (~> 2.6.1) - WebexSDK/Wxc (~> 3.10.1) @@ -2148,7 +2148,7 @@ SPEC CHECKSUMS: react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457 react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253 react-native-view-shot: 6b7ed61d77d88580fed10954d45fad0eb2d47688 - react-native-webex-sdk: ac279301a0ab418956f540a772f20c9eaf0acded + react-native-webex-sdk: 622366554c9f3a84c4a4b272c95cdb49adddb28f react-native-webview: 9f111dfbcfc826084d6c507f569e5e03342ee1c1 react-native-wm-app-review: c57f2253fe9a0c31a03f56df503cf7a5ddabcdc3 react-native-wm-voice-text: 5bacd3a1565e7a1cf936f0a0e399428ea307786c @@ -2192,7 +2192,7 @@ SPEC CHECKSUMS: RNGestureHandler: fe2be3be5598dc74329b211c58c9f2d231461769 RNImageCropPicker: 648356d68fbf9911a1016b3e3723885d28373eda RNInAppBrowser: e36d6935517101ccba0e875bac8ad7b0cb655364 - RNPermissions: 438c75db343dc7cb218befcc63e3b5eb395f6f73 + RNPermissions: 886e1610d7de8eb6a6f3be45b325001a9db69699 RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c RNReanimated: ab1295f59541cb26000d394b4b4aea72cb7ca448 RNScreens: 3c5b9f4a9dcde752466854b6109b79c0e205dad3 --- package-lock.json @@ -50,7 +50,7 @@ "@walmart/avp-feature-app": "0.2.10", "@walmart/avp-shared-library": "0.2.12", "@walmart/backroom-mini-app": "1.0.6", - "@walmart/calling-mini-app": "0.1.13", + "@walmart/calling-mini-app": "0.1.24", "@walmart/checkout-mini-app": "3.9.306", "@walmart/compass-sdk-rn": "5.19.3", "@walmart/config-components": "4.3.1", @@ -95,7 +95,7 @@ "@walmart/react-native-shared-navigation": "6.0.7", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.6.4", - "@walmart/react-native-webex-sdk": "0.1.5", + "@walmart/react-native-webex-sdk": "0.1.8", "@walmart/receipt-check-miniapp": "1.19.3", "@walmart/redux-store": "6.0.7", "@walmart/returns-mini-app": "4.6.0", @@ -11050,9 +11050,9 @@ } }, "node_modules/@walmart/calling-mini-app": { - "version": "0.1.13", - "resolved": "https://npme.walmart.com/@walmart/calling-mini-app/-/calling-mini-app-0.1.13.tgz", - "integrity": "sha512-ouZnG2jUEKSU57gzNDDYWQ1L8QrzbMBAww0EkaN9UXSs/yyR/ftW5QE0v4RzacEenb3WmVyPsgS4PpqoSnHyNA==", + "version": "0.1.24", + "resolved": "https://npme.walmart.com/@walmart/calling-mini-app/-/calling-mini-app-0.1.24.tgz", + "integrity": "sha512-a3sajOHKnzzPxbJzDRUokXRqOMCUQiuI5r3llQyyFw3qlQ5Ym1TuVGll0wJ6t+A40/OxlywXAoSOPI8LPmshiQ==", "dependencies": { "typed-assert": "^1.0.9" }, @@ -11062,6 +11062,7 @@ "@react-navigation/stack": ">=6", "@reduxjs/toolkit": ">=1.9", "@terrylinla/react-native-sketch-canvas": "*", + "@walmart/allspark-foundation": "*", "@walmart/ask-sam-chat-components": ">=0.2.9", "@walmart/core-services": "^2.2.0", "@walmart/core-utils": ">=1.2", @@ -11075,6 +11076,7 @@ "@walmart/wmconnect-mini-app": "*", "axios": "^1.2.4", "axios-cache-adapter": ">=2", + "axios-cache-interceptor": "*", "lodash": ">=4.17", "luxon": "*", "moment": ">=2.26", @@ -12244,9 +12246,9 @@ } }, "node_modules/@walmart/react-native-webex-sdk": { - "version": "0.1.5", - "resolved": "https://npme.walmart.com/@walmart/react-native-webex-sdk/-/react-native-webex-sdk-0.1.5.tgz", - "integrity": "sha512-BDJowEH5liJeiFUcbdHNi/SoQ/GA6NVD3q2/kR2UYhNnY0xA/bqn8sCzA7OfUrcqJ484TmwsnBVrS/B3+AyvxQ==", + "version": "0.1.8", + "resolved": "https://npme.walmart.com/@walmart/react-native-webex-sdk/-/react-native-webex-sdk-0.1.8.tgz", + "integrity": "sha512-uzP+a92WRHDFyV1p2CUS1CkohI0uhvNA8WO+z9GCnEdv/hh3Zm3GHxMTGKO7GYuu+CCJbeeVCAUJWRW3ZEn/Ug==", "license": "MIT", "engines": { "node": ">= 16.0.0" @@ -40813,4 +40815,4 @@ } } } -} +} \ No newline at end of file --- package.json @@ -91,7 +91,7 @@ "@walmart/avp-feature-app": "0.2.10", "@walmart/avp-shared-library": "0.2.12", "@walmart/backroom-mini-app": "1.0.6", - "@walmart/calling-mini-app": "0.1.13", + "@walmart/calling-mini-app": "0.1.24", "@walmart/checkout-mini-app": "3.9.306", "@walmart/compass-sdk-rn": "5.19.3", "@walmart/config-components": "4.3.1", @@ -136,7 +136,7 @@ "@walmart/react-native-shared-navigation": "6.0.7", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.6.4", - "@walmart/react-native-webex-sdk": "0.1.5", + "@walmart/react-native-webex-sdk": "0.1.8", "@walmart/receipt-check-miniapp": "1.19.3", "@walmart/redux-store": "6.0.7", "@walmart/returns-mini-app": "4.6.0", @@ -357,7 +357,7 @@ "@walmart/avp-feature-app": "0.2.10", "@walmart/avp-shared-library": "0.2.12", "@walmart/backroom-mini-app": "1.0.6", - "@walmart/calling-mini-app": "0.1.13", + "@walmart/calling-mini-app": "0.1.24", "@walmart/compass-sdk-rn": "5.19.3", "@walmart/config-components": "4.3.1", "@walmart/copilot-mini-app": "3.70.5", @@ -588,4 +588,4 @@ "pre-push": "run-p solidarity coverage" } } -} +} \ No newline at end of file
Calling changes for drop 20
Calling changes for drop 20
069d7b78a4e6ca48fb850f4539607307fbcc4c57
--- packages/me-at-walmart-container/__tests__/http/utils.test.ts @@ -32,7 +32,8 @@ describe('HTTP/utils', () => { describe('getAsyncLogRate', () => { test('should return default log rate when async storage returns undefined', async () => { (AllsparkLocalStorage.get as jest.Mock).mockResolvedValueOnce(undefined); - getHttpSuccessLogRate(getAsyncLogRate, () => HTTP_SUCCESS_LOG_RATE_KEY) + const getHttSuccessLog = await getHttpSuccessLogRate(getAsyncLogRate, () => HTTP_SUCCESS_LOG_RATE_KEY); + expect(getHttSuccessLog).toBe(DEFAULT_HTTP_SUCCESS_LOG_RATE) const rate = await getAsyncLogRate(); expect(rate).toEqual(DEFAULT_HTTP_SUCCESS_LOG_RATE); expect(HttpLogger.warn).not.toHaveBeenCalled(); @@ -51,7 +52,8 @@ describe('HTTP/utils', () => { describe('getAsyncHeaderSizeLimit', () => { test('should return default header size limit when async storage returns undefined', async () => { (AllsparkLocalStorage.get as jest.Mock).mockResolvedValueOnce(undefined); - getHeaderSizeLimit(getAsyncHeaderSizeLimit, () => HTTP_HEADER_SIZE_LIMIT_KEY) + const getHeaderSize = await getHeaderSizeLimit(getAsyncHeaderSizeLimit, () => HTTP_HEADER_SIZE_LIMIT_KEY); + expect(getHeaderSize).toBe(DEFAULT_HTTP_HEADER_SIZE_LIMIT) const limit = await getAsyncHeaderSizeLimit(); expect(limit).toEqual(DEFAULT_HTTP_HEADER_SIZE_LIMIT); expect(HttpLogger.warn).not.toHaveBeenCalled(); @@ -71,7 +73,8 @@ describe('HTTP/utils', () => { it('should return default allowed http 401 error limit when async storage returns undefined', async () => { const getAsyncAllowedHttp401ErrorLimitMock = jest.fn(); (AllsparkLocalStorage.get as jest.Mock).mockResolvedValueOnce(undefined); - getAllowedHttp401ErrorLimit(getAsyncAllowedHttp401ErrorLimitMock, () => ALLOWED_HTTP_401_ERROR_KEY) + const result = await getAllowedHttp401ErrorLimit(getAsyncAllowedHttp401ErrorLimitMock, () => ALLOWED_HTTP_401_ERROR_KEY); + expect(result).toBe(DEFAULT_ALLOWED_HTTP_401_LIMIT); const limit = await getAsyncAllowedHttp401ErrorLimit(); expect(limit).toEqual(DEFAULT_ALLOWED_HTTP_401_LIMIT); expect(HttpLogger.warn).not.toHaveBeenCalled();
code cleanup
code cleanup
2a2710a0a9099bb50475866ebadea92f901a724e
--- package-lock.json @@ -3277,9 +3277,9 @@ } }, "@walmart/allspark-home-mini-app": { - "version": "0.4.62", - "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.4.62.tgz", - "integrity": "sha512-phVYhjCvhGPx+Nb+Stof07EFxYmSrkrOe6FofSlf8DRWiLNPG4bLhG/pd6GdxlIFCRuBKChSpXrhQ5uiddrLEA==", + "version": "0.5.2", + "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.5.2.tgz", + "integrity": "sha512-g9TEue/Doegf+FPV/vEC/oV+vQp1UFAZsa2VQeGrnIYY5qOJjOxC1QsSH1QpGYvG4jQTXAMc1+zjKnBxb5tE4Q==", "requires": { "moment": "^2.29.0", "uuid": "^8.3.1" --- package.json @@ -71,7 +71,7 @@ "@sharcoux/slider": "^5.2.1", "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@walmart/allspark-health-survey-mini-app": "0.0.42", - "@walmart/allspark-home-mini-app": "0.4.62", + "@walmart/allspark-home-mini-app": "0.5.2", "@walmart/allspark-me-mini-app": "0.2.4", "@walmart/ask-sam-mini-app": "0.30.15", "@walmart/config-components": "^1.0.29", --- src/translations/en-US.ts @@ -5,6 +5,7 @@ export const enUS = { '@walmart/allspark-home-mini-app': 'Home', '@walmart/allspark-me-mini-app': 'Me', '@walmart/ask-sam-mini-app': 'Ask Sam', + '@walmart/metrics-mini-app': 'Metrics', '@walmart/push-to-talk-mini-app': 'Push To Talk', '@walmart/schedule-mini-app': 'Schedules', '@walmart/time-clock-mini-app': 'Time Clock', --- src/translations/es-MX.ts @@ -5,6 +5,7 @@ export const esMX = { '@walmart/allspark-home-mini-app': 'Home', '@walmart/allspark-me-mini-app': 'Me', '@walmart/ask-sam-mini-app': 'Ask Sam', + '@walmart/metrics-mini-app': 'Metrics', '@walmart/push-to-talk-mini-app': 'Push To Talk', '@walmart/schedule-mini-app': 'Schedules', '@walmart/time-clock-mini-app': 'Time Clock',
updated version for home miniapp
updated version for home miniapp
84a39c842f784e336c0f57b2340275279c32eb57
--- ios/BuildSupport/install-cocoapods.sh @@ -9,9 +9,9 @@ CCP_VER=1.12.0 POD_VERSION=$(pod --version) if [ "$RUBY_PATH" ];then -export GEM_HOME=$RUBY_PATH/gem + export GEM_HOME=$RUBY_PATH/gem else -export GEM_HOME=$HOME/.gem + export GEM_HOME=$HOME/.gem fi export PATH=$GEM_HOME/bin:$PATH
Update install-cocoapods.sh
Update install-cocoapods.sh
2a562f1d1c8636167420f350510893d68dffaab0
--- package-lock.json @@ -36,7 +36,7 @@ "@walmart/amp-mini-app": "1.0.11", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.3.56", - "@walmart/attendance-mini-app": "0.73.0", + "@walmart/attendance-mini-app": "0.76.0", "@walmart/config-components": "4.1.0-rc.4", "@walmart/core-services": "~1.4.15", "@walmart/core-services-allspark": "~1.10.18", @@ -4696,9 +4696,9 @@ } }, "node_modules/@walmart/attendance-mini-app": { - "version": "0.73.0", - "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-0.73.0.tgz", - "integrity": "sha512-9CcmyGG/P2ZHlgFp4f/0dM9fWNlekTjpwD6Cfv6Q5fNiViqWeNiUcaBI5Nz92gfNnfEq83pdNtpikIleGDD0Fw==", + "version": "0.76.0", + "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-0.76.0.tgz", + "integrity": "sha512-E1DbwRFYdEKa4SOUafI5sOuBrTIgFuUIGvu3aqx87sl0g1Z7no/qJr7Bhoj7fgWD4k0CJD80UD5sKC7vwUcViA==", "dependencies": { "@walmart/gta-react-native-calendars": "0.0.16", "moment-timezone": "0.5.40", @@ -24920,9 +24920,9 @@ } }, "@walmart/attendance-mini-app": { - "version": "0.73.0", - "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-0.73.0.tgz", - "integrity": "sha512-9CcmyGG/P2ZHlgFp4f/0dM9fWNlekTjpwD6Cfv6Q5fNiViqWeNiUcaBI5Nz92gfNnfEq83pdNtpikIleGDD0Fw==", + "version": "0.76.0", + "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-0.76.0.tgz", + "integrity": "sha512-E1DbwRFYdEKa4SOUafI5sOuBrTIgFuUIGvu3aqx87sl0g1Z7no/qJr7Bhoj7fgWD4k0CJD80UD5sKC7vwUcViA==", "requires": { "@walmart/gta-react-native-calendars": "0.0.16", "moment-timezone": "0.5.40", --- package.json @@ -78,7 +78,7 @@ "@walmart/amp-mini-app": "1.0.11", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.3.56", - "@walmart/attendance-mini-app": "0.73.0", + "@walmart/attendance-mini-app": "0.76.0", "@walmart/config-components": "4.1.0-rc.4", "@walmart/core-services": "~1.4.15", "@walmart/core-services-allspark": "~1.10.18",
update attendance mini app to 0.76.0
update attendance mini app to 0.76.0
54f7c8af65b0978ac19fc338a47b9956cc86be1c
--- packages/allspark-foundation-hub/__tests__/TeamOnboarding/TeamOnboarding.test.tsx @@ -4,15 +4,77 @@ import { render } from '../utils'; import { fireEvent } from '@testing-library/react-native'; import { TeamOnboarding } from '../../src/Store/Modules/Onboarding/TeamOnboarding/Component/TeamOnboarding'; import { TeamOnboardingScreenProps } from '../../src/Store/Modules/Onboarding/TeamOnboarding/Component/TeamOnboarding'; -const DummyIcon = () => <View testID='dummy-icon' />; +import { LoggerService } from '@walmart/allspark-foundation/Logger'; +import { useTelemetryService } from '@walmart/allspark-foundation/Telemetry'; + +// Mock LoggerService +jest.mock('@walmart/allspark-foundation/Logger', () => ({ + LoggerService: { + getContainerInstance: jest.fn(), + }, +})); + +// Mock useTelemetryService +jest.mock('@walmart/allspark-foundation/Telemetry', () => ({ + useTelemetryService: jest.fn(), +})); + +// Mock useUserPersonaType +jest.mock('../../src/Shared/Hooks/useUserPersonaType', () => ({ + useUserPersonaType: jest.fn().mockReturnValue('TL'), + PersonaType: { + teamLead: 'TL', + peopleLead: 'PEOPLE', + salaried: 'SALARIED', + academyTrainer: 'AT', + teamAssociate: 'TA', + }, +})); + +// Create a mock component for testing +const MockImage = (props: { [x: string]: any; onError: any; testID: any }) => { + const { onError, testID, ...otherProps } = props; + // Pass onError to View so it can be triggered in tests + // @ts-ignore - Intentionally passing onError for test functionality + return <View testID={testID} onError={onError} {...otherProps} />; +}; + +// Mock AllsparkImage +jest.mock('@walmart/allspark-foundation/Components/context', () => { + return { + useAllsparkImage: () => MockImage, + }; +}); + +// Mock SafeAreaContext +jest.mock('react-native-safe-area-context', () => ({ + useSafeAreaInsets: jest + .fn() + .mockReturnValue({ bottom: 0, top: 0, left: 0, right: 0 }), +})); describe('TeamOnboarding', () => { + // Reset mocks before each test + beforeEach(() => { + jest.clearAllMocks(); + }); + const mockProps: TeamOnboardingScreenProps = { heading: 'Welcome to the Team', description: 'This is the team onboarding description.', teamOnboardingCardsInfo: [ - { icon: <DummyIcon />, title: 'Card 1', description: 'Description 1' }, - { icon: <DummyIcon />, title: 'Card 2', description: 'Description 2' }, + { + icon: 'icon-url-1', + placeholder: 'placeholder-1', + title: 'Card 1', + description: 'Description 1', + }, + { + icon: 'icon-url-2', + placeholder: 'placeholder-2', + title: 'Card 2', + description: 'Description 2', + }, ], buttonText: 'Get Started', buttonIsDisabled: false, @@ -56,12 +118,43 @@ describe('TeamOnboarding', () => { <TeamOnboarding {...mockProps} /> ); - mockProps.teamOnboardingCardsInfo.forEach(() => { - expect(getByTestId('teamonboarding-heading')).toBeTruthy(); - expect(getByTestId('teamonboarding-description')).toBeTruthy(); - }); + expect(getByTestId('teamonboarding-heading')).toBeTruthy(); + expect(getByTestId('teamonboarding-description')).toBeTruthy(); const icons = getAllByTestId('onboarding-card-icon'); expect(icons.length).toBe(mockProps.teamOnboardingCardsInfo.length); }); + + it('handles image loading errors correctly', () => { + // Setup mocks for logger and telemetry services + const mockLoggerError = jest.fn(); + const mockLogEvent = jest.fn(); + + (LoggerService.getContainerInstance as jest.Mock).mockReturnValue({ + error: mockLoggerError, + }); + + (useTelemetryService as jest.Mock).mockReturnValue({ + logEvent: mockLogEvent, + }); + + // Render the component + const { getByTestId } = render(<TeamOnboarding {...mockProps} />); + + // Get the image component and simulate an error + const image = getByTestId('teamonboarding-image'); + const errorEvent = new Error('Image loading failed'); + fireEvent(image, 'onError', errorEvent); + + // Verify that logger.error was called with the correct parameters + expect(mockLoggerError).toHaveBeenCalledWith('ImageFailure', { + message: `Image failure ${errorEvent}`, + }); + + // Verify that telemetryService.logEvent was called with the correct parameters + expect(mockLogEvent).toHaveBeenCalledWith('image_uri_failure', { + message: 'Image failure', + personaType: 'TL', // We mocked the personaType to be 'TL' + }); + }); });
feat(SMDV-7634): add test coverage for the TeamOnboarding.test.tsx component
feat(SMDV-7634): add test coverage for the TeamOnboarding.test.tsx component
275ee3157a5264370d889583136c280d18f4ff73
--- jest.config.js @@ -22,5 +22,3 @@ module.exports = { }, }, }; - -
fix: update jest.config
fix: update jest.config
6ed22891c133d78a7d85a944ad7475bab80d44c9
--- package-lock.json @@ -33,7 +33,7 @@ "@terrylinla/react-native-sketch-canvas": "0.8.0", "@walmart/allspark-graphql-client": "^1.4.5", "@walmart/allspark-neon-core": "0.1.31", - "@walmart/amp-mini-app": "1.0.11", + "@walmart/amp-mini-app": "1.1.26", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.3.59", "@walmart/attendance-mini-app": "0.77.0", @@ -4754,7 +4754,9 @@ } }, "node_modules/@walmart/amp-mini-app": { - "version": "1.0.11", + "version": "1.1.26", + "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.26.tgz", + "integrity": "sha512-mAbuZhWKv2Z8heZDFD/FT4XgZ7f/6kb4z0IbwlKo2Fps7rNJikEfZU4jZJFGV8m89y8yUi+tKUuf9BU0wvHGTg==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -5195,7 +5197,6 @@ } }, "node_modules/@walmart/financial-wellbeing-feature-app": { - "version": "1.4.2", "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.4.2.tgz", "integrity": "sha512-IOcFYCG2y/+pwMctJECL/Rpi+Kzkfn+6OtETp+XtNiFHQ8m81C3qannJYZQPQdJB3htpJfTPgKpcsjqyuRQvgA==", @@ -24951,7 +24952,9 @@ } }, "@walmart/amp-mini-app": { - "version": "1.0.11" + "version": "1.1.26", + "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.26.tgz", + "integrity": "sha512-mAbuZhWKv2Z8heZDFD/FT4XgZ7f/6kb4z0IbwlKo2Fps7rNJikEfZU4jZJFGV8m89y8yUi+tKUuf9BU0wvHGTg==" }, "@walmart/ask-sam-chat-components": { "version": "0.2.13", --- package.json @@ -75,7 +75,7 @@ "@terrylinla/react-native-sketch-canvas": "0.8.0", "@walmart/allspark-graphql-client": "^1.4.5", "@walmart/allspark-neon-core": "0.1.31", - "@walmart/amp-mini-app": "1.0.11", + "@walmart/amp-mini-app": "1.1.26", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.3.59", "@walmart/attendance-mini-app": "0.77.0",
AMP version for drop 10
AMP version for drop 10
1a4dc67daa393b528cfc1b46d2eae17d58ee07ea
--- __tests__/setup.ts @@ -12,7 +12,7 @@ jest.mock('@walmart/functional-components', () => { }; }); -jest.mock('../src/utils/timestamps.ts', () => { +jest.mock('../src/utils/timestamps', () => { return { daysAgoTimestamp: jest.fn( (numDays) => new Date(Date.now() - numDays * 24 * 60 * 60 * 1000), --- __tests__/utils/timestamp-test.ts @@ -3,6 +3,10 @@ import moment from 'moment'; const mockTranslationFunction = jest.fn((key) => key); +jest.mock('../../src/utils/timestamps', () => + jest.requireActual('../../src/utils/timestamps'), +); + describe('channelRowTimeStamp function', () => { const currentDate = moment('2023-09-21'); it('returns the formatted time when lastMessageTimeStamp is on the same day', () => { --- __tests__/setup.ts @@ -12,7 +12,7 @@ jest.mock('@walmart/functional-components', () => { }; }); -jest.mock('../src/utils/timestamps.ts', () => { +jest.mock('../src/utils/timestamps', () => { return { daysAgoTimestamp: jest.fn( (numDays) => new Date(Date.now() - numDays * 24 * 60 * 60 * 1000), --- __tests__/utils/timestamp-test.ts @@ -3,6 +3,10 @@ import moment from 'moment'; const mockTranslationFunction = jest.fn((key) => key); +jest.mock('../../src/utils/timestamps', () => + jest.requireActual('../../src/utils/timestamps'), +); + describe('channelRowTimeStamp function', () => { const currentDate = moment('2023-09-21'); it('returns the formatted time when lastMessageTimeStamp is on the same day', () => {
using requireActial for the utils/timestamps test
using requireActial for the utils/timestamps test
52a77a81448042f66d10b3932fe56f16a24f1c2a
--- src/core/envInit.ts @@ -9,9 +9,6 @@ export const initialState = { internalBffUrl: Config.internalBffUrl, bffService: Config.bffService, rbacAppId: Config.rbacAppId, - inboxConsumerId: Config.inboxConsumerId, - inboxService: Config.inboxService, - inboxAppUUID: Config.inboxAppUUID, }; export const envReducer = (state: any = initialState) => state; @@ -24,9 +21,6 @@ export const initEnv = () => { internalBffUrl: Config.internalBffUrl, bffService: Config.bffService, rbacAppId: Config.rbacAppId, - inboxConsumerId: Config.inboxConsumerId, - inboxService: Config.inboxService, - inboxAppUUID: Config.inboxAppUUID, } as SharedConfig); reducerManager.addReducer('envConfig', envReducer);
remove inbox env dependencies
remove inbox env dependencies
02a64467962b4e0e6686514ca0e130051d9d0235
--- package.json @@ -97,7 +97,7 @@ "@walmart/core-services-allspark": "workspace:^", "@walmart/core-widget-registry": "workspace:^", "@walmart/counts-component-miniapp": "0.2.4", - "@walmart/digital-locks-mini-app": "1.3.1-rc.2", + "@walmart/digital-locks-mini-app": "1.4.4", "@walmart/emergency-mini-app": "1.32.5", "@walmart/exception-mini-app": "1.8.15", "@walmart/expo-config-plugins": "^0.2.0", --- yarn.lock @@ -7932,9 +7932,9 @@ __metadata: languageName: node linkType: hard -"@walmart/digital-locks-mini-app@npm:1.3.1-rc.2": - version: 1.3.1-rc.2 - resolution: "@walmart/digital-locks-mini-app@npm:1.3.1-rc.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fdigital-locks-mini-app%2F-%2F%40walmart%2Fdigital-locks-mini-app-1.3.1-rc.2.tgz" +"@walmart/digital-locks-mini-app@npm:1.4.4": + version: 1.4.4 + resolution: "@walmart/digital-locks-mini-app@npm:1.4.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fdigital-locks-mini-app%2F-%2F%40walmart%2Fdigital-locks-mini-app-1.4.4.tgz" peerDependencies: "@walmart/allspark-foundation": ">=6.0.0" react: "*" @@ -7945,7 +7945,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/4e284969efce01979d04f3e7e601571fd401340e60d0392f6fb924c02d4a2244115b4008aecf6137a5ac8470e95ab9d928b42c6e2fd3c389ff527301be544ea5 + checksum: 10c0/d24f4906700de436c9d3f8601716e948725c52031f7a0b0e0015eadea38ce83688462279997082c8898fc0a4d27bff6db2a94e5c9e920b9c1c03b998f01227e2 languageName: node linkType: hard @@ -8573,7 +8573,7 @@ __metadata: "@walmart/core-services-allspark": "workspace:^" "@walmart/core-widget-registry": "workspace:^" "@walmart/counts-component-miniapp": "npm:0.2.4" - "@walmart/digital-locks-mini-app": "npm:1.3.1-rc.2" + "@walmart/digital-locks-mini-app": "npm:1.4.4" "@walmart/emergency-mini-app": "npm:1.32.5" "@walmart/exception-mini-app": "npm:1.8.15" "@walmart/expo-config-plugins": "npm:^0.2.0"
feat(digitalkey): DIGS-837 Digital Key Drop 31 (#4167)
feat(digitalkey): DIGS-837 Digital Key Drop 31 (#4167) * feat(digitalkey): bump digital locks to 1.4.1 and Bump invue sdk to 0.1.26-alpha.12 * feat(digitalkey): bumped version to 1.4.2 * feat(digitalkey): bumped version to 1.4.3 * feat(digitalkey): bumped to version 1.4.4 * bug(fix yarn lock): fixed yarn lock --------- Co-authored-by: gary wong <gary.wong@walmart.com> Co-authored-by: Alex Scarlett <Alex.Scarlett@walmart.com> Co-authored-by: Maksym Novakh - m0n09mr <Maksym.Novakh0@walmart.com>
d2ba58c3e94cc5193a1f06e16d7247bfdbb1c217
--- packages/core-services-allspark/src/index.tsx @@ -1,11 +1,15 @@ import React, {PropsWithChildren, useMemo} from 'react'; -import {MeAtWalmartContainer} from '@walmart/me-at-walmart-container'; +import { + MeAtWalmartContainer, + IMeAtWalmartAuthService, +} from '@walmart/me-at-walmart-container'; // Imports needed for TS errors // The inferred type of X cannot be named without a reference to '...'. This is likely not portable. A type annotation is necessary. import '@walmart/allspark-foundation/Container'; import '@walmart/allspark-foundation/Feature'; import {LegacyEnvConfig} from './types'; import {transformLegacyEnv} from './utils'; +import {IMeAtWalmartEnvironment} from '@walmart/me-at-walmart-common'; /** * @deprecated use `MeAtWalmartContainer` from "@walmart/me-at-walmart-container" to @@ -39,3 +43,19 @@ export const AllsparkCoreServices = ( </MeAtWalmartContainer.Provider> ); }; + +/** + * @deprecated - use IMeAtWalmartAuthService from '@walmart/me-at-walmart-container' instead + * @example + * import {IMeAtWalmartAuthService} from '@walmart/me-at-walmart-container'; + */ +type IAllsparkAuth = IMeAtWalmartAuthService; + +/** + * @deprecated - use IMeAtWalmartEnvironment from '@walmart/me-at-walmart-common' instead + * @example + * import {IMeAtWalmartEnvironment} from '@walmart/me-at-walmart-common'; + */ +type IAllsparkEnvConfig = IMeAtWalmartEnvironment; + +export type {IAllsparkEnvConfig, IAllsparkAuth};
fix: add legacy types for backwards compatability
fix: add legacy types for backwards compatability
31c94d1948ebd35ae0f2c34ef4aa8242ce378ba7
--- .looper.multibranch.yml @@ -1,5 +1,10 @@ inherit: "job:///metropolis/metroloop/metroloop-parent" -node: ((stable_osx||xcode12.5)&&!MAC-LAB-MINI36&&!MAC-LAB-MINI32&&!MAC-LAB-MINI07) + +## +## Whenever you update the nodes, please update it at the two-place, below line & the global variable LOOPER_NODES +## + +node: ((stable_osx||xcode12.5)&&!MAC-LAB-MINI36&&!MAC-LAB-MINI32&&!MAC-LAB-MINI07&&!MAC-DRFQLAB-MINI43) tools: android: @@ -38,6 +43,8 @@ cache: envs: global: variables: + LOOPER_NODES: "((stable_osx||xcode12.5)&&!MAC-LAB-MINI36&&!MAC-LAB-MINI32&&!MAC-LAB-MINI07&&!MAC-DRFQLAB-MINI43)" + TMPDIR: /tmp TARGET_XCODE: "12.3" @@ -238,7 +245,7 @@ flows: - ls -l "${WORKSPACE}/ios/Podfile.lock" - call: pr # - call: auto-version - - node(label="stable_osx", ws="exclusive"): + - node(label=$LOOPER_NODES, ws="exclusive"): - parallel(failsafe): - call: build-native(ios) - call: build-native(android) @@ -285,7 +292,7 @@ flows: - if: | %{ buildType == "SNAPSHOT" } then: - - node(label="stable_osx", ws="exclusive"): + - node(label=$LOOPER_NODES, ws="exclusive"): - parallel(failsafe): - group("$os dev"): - call: build-snapshot(dev) @@ -563,4 +570,3 @@ flows: - echo "about to set Build Output variable" - var(buildOutput = "./ios/build/${ARCHIVE_TYPE}/Artifacts/${ARCHIVE_TYPE}-${XC_SCHEME}.ipa") - echo "Build Output variable path => ${buildOutput}" -
Feature/looper nodes fix (#554)
Feature/looper nodes fix (#554) * excluding looper nodes * excluding looper nodes * excluding looper nodes * Update .looper.multibranch.yml * excluding looper nodes Co-authored-by: Hitesh Arora <> Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com>
f8ac15d7918e09381971201c4c5e7efacedb45aa
--- packages/me-at-walmart-athena-queries/src/getSupplyChainTeamsByStore.graphql @@ -1,8 +1,4 @@ -query GetSupplyChainTeamsByStore( - $businessUnitNumber: Int! - $countryCode: String! - $includeManagement: Boolean -) { +query GetSupplyChainTeamsByStore($businessUnitNumber: Int!, $countryCode: String!, $includeManagement: Boolean) { supplyChainTeamsByBusinessUnit( businessUnitNumber: $businessUnitNumber countryCode: $countryCode --- packages/me-at-walmart-athena-queries/src/getTeamsbyStore.graphql @@ -1,8 +1,4 @@ -query GetTeamsByStore( - $countryCode: String! - $includeManagement: Boolean - $storeNbr: String! -) { +query GetTeamsByStore($countryCode: String!, $includeManagement: Boolean, $storeNbr: String!) { getTeamsByStore( countryCode: $countryCode includeManagement: $includeManagement --- packages/my-walmart-hub/src/Shared/Hooks/useGetViewersPrimaryTeam.ts @@ -94,7 +94,7 @@ import { useSelector } from 'react-redux'; import { Team, UserSelectors } from '@walmart/allspark-foundation/User'; -import { EMP_TYPE_SALARIED } from '../Constants/employees'; +import { EMP_TYPE_SALARIED, HOME_OFFICE_DOMAIN } from '../Constants/employees'; import { MANAGEMENT_TEAM_ID, MANAGEMENT_TEAM_LABEL, @@ -218,6 +218,10 @@ export const useGetViewersPrimaryTeam = (): TeamInfo[] => { */ const viewerTeam: Team[] | undefined = useSelector(UserSelectors.getTeams); + const userDomain: string | undefined = useSelector(UserSelectors.getDomain); + const isHomeOffice: boolean = + userDomain?.toLowerCase() === HOME_OFFICE_DOMAIN; + /** * User's salaried status * @@ -286,7 +290,7 @@ export const useGetViewersPrimaryTeam = (): TeamInfo[] => { * Management Team, giving them access to management-specific * features and capabilities. */ - if (!isSiteDC && (isSalaried || isUserSalariedEmployee)) { + if (!isSiteDC && !isHomeOffice && (isSalaried || isUserSalariedEmployee)) { return [ { teamName: MANAGEMENT_TEAM_LABEL,
feat(ui): update primary team hook logic (#504)
feat(ui): update primary team hook logic (#504) * feat(ui): added check for homeoffice users to not see managemet as a primary team * feat(ui): updated hash for persisted queries * feat(ui): update query hashes --------- Co-authored-by: p0d02sx <prasansuresh.dhresh@walmart.com>
60ae420ca4243d349441bd49e35c67753180023f
--- 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.32](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.25.31...@walmart/allspark-foundation-hub@1.25.32) (2026-01-06) + +**Note:** Version bump only for package @walmart/allspark-foundation-hub + ## [1.25.31](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.25.30...@walmart/allspark-foundation-hub@1.25.31) (2026-01-05) **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.31", + "version": "1.25.32", "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.12](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.17.11...@walmart/allspark-foundation@7.17.12) (2026-01-06) + +**Note:** Version bump only for package @walmart/allspark-foundation + ## [7.17.11](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.17.10...@walmart/allspark-foundation@7.17.11) (2026-01-05) ### Bug Fixes --- packages/allspark-foundation/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation", - "version": "7.17.11", + "version": "7.17.12", "description": "", "main": "Core/index.js", "types": "Core/index.d.ts", --- packages/components-library/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.3.2](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/ax-components@1.3.1...@walmart/ax-components@1.3.2) (2026-01-06) + +**Note:** Version bump only for package @walmart/ax-components + ## [1.3.1](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/ax-components@1.3.0...@walmart/ax-components@1.3.1) (2025-12-29) **Note:** Version bump only for package @walmart/ax-components --- packages/components-library/package.json @@ -52,7 +52,7 @@ "test:coverage": "jest --coverage", "expo:check": "expo install --check" }, - "version": "1.3.1", + "version": "1.3.2", "main": "lib/index.js", "types": "lib/index.d.ts", "name": "@walmart/ax-components", --- 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.11.3](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/my-walmart-hub@1.11.2...@walmart/my-walmart-hub@1.11.3) (2026-01-06) + +**Note:** Version bump only for package @walmart/my-walmart-hub + ## [1.11.2](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/my-walmart-hub@1.11.1...@walmart/my-walmart-hub@1.11.2) (2026-01-05) **Note:** Version bump only for package @walmart/my-walmart-hub --- packages/my-walmart-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/my-walmart-hub", - "version": "1.11.2", + "version": "1.11.3", "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.12 - @walmart/allspark-foundation-hub@1.25.32 - @walmart/ax-components@1.3.2 - @walmart/my-walmart-hub@1.11.3
cc3833dc9fc8e9318a488249828b8f1c55f53540
--- targets/US/ios/Podfile.lock @@ -1929,7 +1929,7 @@ PODS: - React-Core - react-native-safe-area-context (4.10.1): - React-Core - - react-native-scanner-3.0 (0.8.1): + - react-native-scanner-3.0 (0.8.2): - Firebase/Analytics - React - ScanditBarcodeCapture (= 6.25.2) @@ -2242,7 +2242,7 @@ PODS: - FirebaseMessaging (<= 10.18.0) - StructuredLogAssistantIOS (= 0.0.7) - TOCropViewController (2.7.4) - - topstock-mini-app (1.16.17): + - topstock-mini-app (1.16.21): - React - VisionCamera (3.7.1): - React @@ -2834,7 +2834,7 @@ SPEC CHECKSUMS: react-native-pdf: 103940c90d62adfd259f63cca99c7c0c306b514c react-native-render-html: 984dfe2294163d04bf5fe25d7c9f122e60e05ebe react-native-safe-area-context: dcab599c527c2d7de2d76507a523d20a0b83823d - react-native-scanner-3.0: e0c4c6a55a6bd34cd2ac99f27c7f6bb32bf9ce16 + react-native-scanner-3.0: cb097ec5234ea1c7713c9d5d74f323ee840e0dfb react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457 react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253 react-native-view-shot: 6b7ed61d77d88580fed10954d45fad0eb2d47688 @@ -2905,7 +2905,7 @@ SPEC CHECKSUMS: StructuredLogAssistantIOS: d48c327b3b67366d954435891dc1e748a6aeb9c1 SumoSDK: 58664bf3b83e2f4bcdfc52704235ab4bca519ceb TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654 - topstock-mini-app: 014a7122dd1074ce684f35231442e0c864816f00 + topstock-mini-app: e8fc0c27d5187623e4fcae808293896edea9dee5 VisionCamera: ef56ac9d3e0fef4b94c7cf75735aaccc2326e35a walmart-react-native-sumo-sdk: a6dc20c0ec3c8ab878886529a0e2fc22e747821c WebexSDK: d652713bd7ad5902e81918121912ba75a0056c3b --- targets/US/package.json @@ -131,7 +131,7 @@ "@walmart/react-native-encrypted-storage": "~1.1.3", "@walmart/react-native-env": "~6.3.20", "@walmart/react-native-logger": "1.34.8", - "@walmart/react-native-scanner-3.0": "0.8.1", + "@walmart/react-native-scanner-3.0": "0.8.2", "@walmart/react-native-shared-navigation": "~6.3.20", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.7.0", @@ -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.16.17", + "@walmart/topstock-mini-app": "1.16.21", "@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 @@ -6857,7 +6857,7 @@ __metadata: "@walmart/react-native-encrypted-storage": "npm:~1.1.3" "@walmart/react-native-env": "npm:~6.3.20" "@walmart/react-native-logger": "npm:1.34.8" - "@walmart/react-native-scanner-3.0": "npm:0.8.1" + "@walmart/react-native-scanner-3.0": "npm:0.8.2" "@walmart/react-native-shared-navigation": "npm:~6.3.20" "@walmart/react-native-store-map": "npm:0.3.7" "@walmart/react-native-sumo-sdk": "npm:2.7.0" @@ -6874,7 +6874,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.16.17" + "@walmart/topstock-mini-app": "npm:1.16.21" "@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" @@ -7433,12 +7433,12 @@ __metadata: languageName: node linkType: hard -"@walmart/react-native-scanner-3.0@npm:0.8.1": - version: 0.8.1 - resolution: "@walmart/react-native-scanner-3.0@npm:0.8.1" +"@walmart/react-native-scanner-3.0@npm:0.8.2": + version: 0.8.2 + resolution: "@walmart/react-native-scanner-3.0@npm:0.8.2" peerDependencies: react-native: ">=0.47.1" - checksum: 10c0/9bf8dfa332636f7fad34de5b0a928f4ae5e08dc768af841564d009c183a1a5ab6437a03b9ed8ea831d3d2c92c1768557f5618805d82d73df0abb736dacdbbce8 + checksum: 10c0/d18b225cfacec354aac53be3225105662ff93e4779dc5c9545c9b7db942cfb9c3c1e734c0b85ac96d3947209171600fd8cb14e3133815b2bba37c05565dc23df languageName: node linkType: hard @@ -7860,9 +7860,9 @@ __metadata: languageName: node linkType: hard -"@walmart/topstock-mini-app@npm:1.16.17": - version: 1.16.17 - resolution: "@walmart/topstock-mini-app@npm:1.16.17" +"@walmart/topstock-mini-app@npm:1.16.21": + version: 1.16.21 + resolution: "@walmart/topstock-mini-app@npm:1.16.21" peerDependencies: "@react-native-firebase/app": ^15.1.1 "@react-native-firebase/crashlytics": ^15.1.1 @@ -7879,7 +7879,7 @@ __metadata: react-native-haptic-feedback: ^1.13.0 react-native-vector-icons: ">=6.6.0" react-redux: ">=7.2.0" - checksum: 10c0/9332d8fb7792e99f6fe734670ef1d60e23e9657d9b4ae779de5ad1f2eb4a6c0d2bca28153f0b6f6c6b7aad821e0dee36d745da338724ca604c129af9a8811e07 + checksum: 10c0/9747126eed0e42b2c687b89cf278aef544b00a75fc46543800917095c154da372f21f17d4759cfc5096a54eb98979a22ef316dd6845af903f50b8af5a90b8429 languageName: node linkType: hard
upgrade topstock and scanner version 1.16.21 and 0.8.2
upgrade topstock and scanner version 1.16.21 and 0.8.2
0ad30f7cfd205ec7b12bb3a89728c853edc360d8
--- package-lock.json @@ -47,7 +47,7 @@ "@walmart/calling-mini-app": "0.1.13", "@walmart/compass-sdk-rn": "5.18.15", "@walmart/config-components": "4.2.17", - "@walmart/copilot-mini-app": "3.59.9", + "@walmart/copilot-mini-app": "3.62.1", "@walmart/core-services": "~2.3.0", "@walmart/core-services-allspark": "~2.13.11", "@walmart/core-utils": "~2.0.5", @@ -8678,9 +8678,9 @@ } }, "node_modules/@walmart/copilot-mini-app": { - "version": "3.59.9", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.59.9.tgz", - "integrity": "sha512-KqgXRrFMCyTGxbDZGV4wkgEtFuBQ1IYyc6FQnj6Va8bZ2jSS+PzGy1Y1wjhcqm0Fp9WibPivefpSMffkdeQVxw==", + "version": "3.62.1", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.62.1.tgz", + "integrity": "sha512-4RoJzaG4SLXxCLzIS7BVaL6oj9NR7uNr8e07K4zyW+S9b06yFGyCR/QaIAF9PycFCKD2hKvB9OsCk0+wtZbfQw==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -33180,9 +33180,9 @@ } }, "@walmart/copilot-mini-app": { - "version": "3.59.9", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.59.9.tgz", - "integrity": "sha512-KqgXRrFMCyTGxbDZGV4wkgEtFuBQ1IYyc6FQnj6Va8bZ2jSS+PzGy1Y1wjhcqm0Fp9WibPivefpSMffkdeQVxw==" + "version": "3.62.1", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.62.1.tgz", + "integrity": "sha512-4RoJzaG4SLXxCLzIS7BVaL6oj9NR7uNr8e07K4zyW+S9b06yFGyCR/QaIAF9PycFCKD2hKvB9OsCk0+wtZbfQw==" }, "@walmart/core-services": { "version": "2.3.2", --- package.json @@ -88,7 +88,7 @@ "@walmart/calling-mini-app": "0.1.13", "@walmart/compass-sdk-rn": "5.18.15", "@walmart/config-components": "4.2.17", - "@walmart/copilot-mini-app": "3.59.9", + "@walmart/copilot-mini-app": "3.62.1", "@walmart/core-services": "~2.3.0", "@walmart/core-services-allspark": "~2.13.11", "@walmart/core-utils": "~2.0.5",
Updatint copilot version
Updatint copilot version
6c2946cf3b308b59e24011df35e9ef70e7fccb23
--- package.json @@ -1,6 +1,6 @@ { "name": "allspark-main", - "version": "1.0.101", + "version": "1.0.102", "private": true, "scripts": { "firebase:dev": "cp ./ios/GoogleService-Info-Dev.plist ./ios/GoogleService-Info.plist && cp ./android/app/google-services-dev.json ./android/app/google-services.json", @@ -63,7 +63,7 @@ "@redux-saga/testing-utils": "^1.1.3", "@sharcoux/slider": "^5.2.1", "@terrylinla/react-native-sketch-canvas": "^0.8.0", - "@walmart/shelfavailability-mini-app": "0.3.50", + "@walmart/shelfavailability-mini-app": "0.3.51", "@walmart/allspark-health-survey-mini-app": "0.0.41", "@walmart/allspark-home-mini-app": "0.4.0", "@walmart/allspark-me-mini-app": "0.1.0",
0.3.51 dev
0.3.51 dev
9bb82dc4a067ec619f454123d3af40b9f42006b8
--- .looper.yml @@ -24,4 +24,3 @@ flows: - yarn install - yarn run lint - yarn run coverage -
feat(ui): updating roster version
feat(ui): updating roster version
86e9d7107730683c0e76bcd17ac5fdd6ace3f5c4
--- src/screens/MessagesScreen.tsx @@ -211,6 +211,9 @@ export const MessagesScreen = () => { lastMessageTime: createdAt, [`recentRead.${viewerId}`]: createdAt, }); + + //Send push notification to receivers + }; return ( --- src/services/PushNotificationApi.ts @@ -0,0 +1,38 @@ +import {defaultHttpClient} from '@walmart/functional-components'; +import {HTTP_CLIENT_KEY} from './config'; + +//TODO: Configure the baseURL based on environment. +const pushNotificationBaseURL = + 'http://texting-notification-service-dev.smdv-backend.k8s.glb.us.walmart.net'; +const NOTIFY_RECIPIENTS_ENDPOINT = 'notifyRecipients'; + +interface IPushNotificationApi { + notifyRecipients: () => Promise<any>; +} + +const BasePushNotificationApi = defaultHttpClient.clone( + { + baseURL: pushNotificationBaseURL, + headers: { + 'cache-control': 'no-cache', + ping_token_idp: 'yes', + Accept: 'application/json', + }, + timeout: 10000, + }, + HTTP_CLIENT_KEY, +); + +export const PushNotificationApi: IPushNotificationApi = { + notifyRecipients: () => { + return BasePushNotificationApi.post(NOTIFY_RECIPIENTS_ENDPOINT, { + data: { + title: 'Test Push', + alert: 'Text Message Sent', + recipients: ['j0w0558'], + storeNumber: 100, + channelId: 'STORE_ALL', + }, + }); + }, +}; --- src/screens/MessagesScreen.tsx @@ -211,6 +211,9 @@ export const MessagesScreen = () => { lastMessageTime: createdAt, [`recentRead.${viewerId}`]: createdAt, }); + + //Send push notification to receivers + }; return ( --- src/services/PushNotificationApi.ts @@ -0,0 +1,38 @@ +import {defaultHttpClient} from '@walmart/functional-components'; +import {HTTP_CLIENT_KEY} from './config'; + +//TODO: Configure the baseURL based on environment. +const pushNotificationBaseURL = + 'http://texting-notification-service-dev.smdv-backend.k8s.glb.us.walmart.net'; +const NOTIFY_RECIPIENTS_ENDPOINT = 'notifyRecipients'; + +interface IPushNotificationApi { + notifyRecipients: () => Promise<any>; +} + +const BasePushNotificationApi = defaultHttpClient.clone( + { + baseURL: pushNotificationBaseURL, + headers: { + 'cache-control': 'no-cache', + ping_token_idp: 'yes', + Accept: 'application/json', + }, + timeout: 10000, + }, + HTTP_CLIENT_KEY, +); + +export const PushNotificationApi: IPushNotificationApi = { + notifyRecipients: () => { + return BasePushNotificationApi.post(NOTIFY_RECIPIENTS_ENDPOINT, { + data: { + title: 'Test Push', + alert: 'Text Message Sent', + recipients: ['j0w0558'], + storeNumber: 100, + channelId: 'STORE_ALL', + }, + }); + }, +};
update payload
update payload
6cf58158953b2f945e1ff98b9ae78faea306c13f
--- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.2.7-alpha.1", + "version": "1.2.7-alpha.2", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts",
Update the allspark foundation hub version for SC
Update the allspark foundation hub version for SC
0412ffbd5ed3cc1e6faf05dd8449054ee3b1f10a
--- packages/expo-config-plugins/src/index.ts @@ -32,6 +32,7 @@ export default function getPlugins(additionalPlugins?: additionalPlugins[]) { moduleBasePath + 'withAndroidOfflineRun', moduleBasePath + 'withAppAuth', moduleBasePath + 'withEdgeToEdgeOptOut', + moduleBasePath + 'withEmmAppRestrictions', moduleBasePath + 'withBoringSSLFix', moduleBasePath + 'withBuildSupport', moduleBasePath + 'withCompassSDK', @@ -102,6 +103,7 @@ export const withActiveArchFix = moduleBasePath + 'withActiveArchFix'; export const withAndroidOfflineRun = moduleBasePath + 'withAndroidOfflineRun'; export const withAppAuth = moduleBasePath + 'withAppAuth'; export const withEdgeToEdgeOptOut = moduleBasePath + 'withEdgeToEdgeOptOut'; +export const withEmmAppRestrictions = moduleBasePath + 'withEmmAppRestrictions'; export const withBoringSSLFix = moduleBasePath + 'withBoringSSLFix'; export const withBuildSupport = moduleBasePath + 'withBuildSupport'; export const withCompassSDK = moduleBasePath + 'withCompassSDK'; --- packages/expo-config-plugins/src/withEmmAppRestrictions.ts @@ -0,0 +1,90 @@ +import { ConfigPlugin, withAndroidManifest, withDangerousMod } from '@expo/config-plugins'; +import { promises as fs } from 'fs'; +import path from 'path'; + +/** + * Expo config plugin to add EMM (Enterprise Mobility Management) App Restrictions + * This plugin configures Android to support managed configurations via APP_RESTRICTIONS + */ + +/** + * Add APP_RESTRICTIONS meta-data to AndroidManifest.xml + */ +const withAppRestrictionsMetadata: ConfigPlugin = (config) => { + return withAndroidManifest(config, async (config) => { + const androidManifest = config.modResults; + const application = androidManifest.manifest.application?.[0]; + + if (!application) { + throw new Error('Could not find <application> tag in AndroidManifest.xml'); + } + + // Ensure meta-data array exists + application['meta-data'] ??= []; + + // Check if APP_RESTRICTIONS meta-data already exists + const hasAppRestrictions = application['meta-data'].some( + (meta) => meta.$?.['android:name'] === 'android.content.APP_RESTRICTIONS' + ); + + // Add APP_RESTRICTIONS meta-data if it doesn't exist + if (!hasAppRestrictions) { + application['meta-data'].push({ + $: { + 'android:name': 'android.content.APP_RESTRICTIONS', + 'android:resource': '@xml/app_restrictions', + }, + }); + } + + return config; + }); +}; + +/** + * Create app_restrictions.xml file + */ +const withAppRestrictionsXml: ConfigPlugin = (config) => { + return withDangerousMod(config, [ + 'android', + async (config) => { + const resDir = path.join( + config.modRequest.platformProjectRoot, + 'app/src/main/res' + ); + const xmlDir = path.join(resDir, 'xml'); + const xmlFile = path.join(xmlDir, 'app_restrictions.xml'); + + // Create xml directory if it doesn't exist + await fs.mkdir(xmlDir, { recursive: true }); + + // Create app_restrictions.xml + const xmlContent = `<?xml version="1.0" encoding="utf-8"?> +<restrictions xmlns:android="http://schemas.android.com/apk/res/android"> + <restriction + android:key="emmDeviceType" + android:title="EMM Device Type" + android:description="Specifies the device classification for enterprise management (COPE, BYOD, PERSONAL)" + android:restrictionType="string" + android:defaultValue="" /> +</restrictions> +`; + + await fs.writeFile(xmlFile, xmlContent, 'utf-8'); + console.log('✓ Created app_restrictions.xml for EMM managed configurations'); + + return config; + }, + ]); +}; + +/** + * Main plugin export + */ +const withEmmAppRestrictions: ConfigPlugin = (config) => { + config = withAppRestrictionsMetadata(config); + config = withAppRestrictionsXml(config); + return config; +}; + +export default withEmmAppRestrictions; \ No newline at end of file
feat(expo-config-plugins): add emm app restrictions plugin (#550)
feat(expo-config-plugins): add emm app restrictions plugin (#550)
42dd1d08338ef3b4e68a881a46ac46e55d3bb729
--- .yarn/patches/@walmart-me-at-walmart-container-npm-6.1.4-9866658c81.patch @@ -1,3 +1,16 @@ +diff --git a/lib/environment/env.prod.js b/lib/environment/env.prod.js +index e63f69c732ecc1598f25bfed9bf3ce353144cf04..aa82af79a3a593efb06d3920b46e7c8b9d862dc9 100644 +--- a/lib/environment/env.prod.js ++++ b/lib/environment/env.prod.js +@@ -16,7 +16,7 @@ const config = { + candidate: { + issuer: 'https://pfedprod.wal-mart.com', + clientId: 'WMProd', +- redirectUrl: 'com.walmart.stores.allspark.beta://CandidateLogin', ++ redirectUrl: 'com.walmart.squiggly://CandidateLogin', + scopes: ['openid', 'full'], + clientAuthMethod: 'post', + }, diff --git a/lib/services/telemetry.js b/lib/services/telemetry.js index df12df7271434ce6060c4caeca6bbdf563257b67..2899691484385b83c0ad583c2595dae84cb35cae 100644 --- a/lib/services/telemetry.js --- yarn.lock @@ -6503,7 +6503,7 @@ __metadata: "@walmart/me-at-walmart-container@patch:@walmart/me-at-walmart-container@npm%3A6.1.4#~/.yarn/patches/@walmart-me-at-walmart-container-npm-6.1.4-9866658c81.patch": version: 6.1.4 - resolution: "@walmart/me-at-walmart-container@patch:@walmart/me-at-walmart-container@npm%3A6.1.4#~/.yarn/patches/@walmart-me-at-walmart-container-npm-6.1.4-9866658c81.patch::version=6.1.4&hash=1b1bda" + resolution: "@walmart/me-at-walmart-container@patch:@walmart/me-at-walmart-container@npm%3A6.1.4#~/.yarn/patches/@walmart-me-at-walmart-container-npm-6.1.4-9866658c81.patch::version=6.1.4&hash=116b61" dependencies: "@walmart/allspark-utils": "npm:^6.1.4" jwt-decode: "npm:^3.1.2" @@ -6538,7 +6538,7 @@ __metadata: optional: true "@walmart/me-at-walmart-athena-queries": optional: true - checksum: 10c0/ba6179c2d018ce7aa565aeffe1e17756be2efb7ae2109849b66ca1eb85856786249f9ce14cf7584e1452e27c189de3a1e2614eea13c32ac10c54877ef0bdb077 + checksum: 10c0/076aa53aee00d2f21fa51797e11538ed6f8bdc143ab4b457df787b72c8fd4d39511c9d78b61a03b231c82a2626ec70717223bfd8481532ad797191a1543d005a languageName: node linkType: hard
update patch package for me-at container.
update patch package for me-at container.
3c82b06caf6c36bd96ae0c6a7550a64047740b7d
--- src/settings/privacy/PrivacyPreferences.tsx @@ -79,6 +79,10 @@ export const PrivacyPreferences = ( UserSelectors.getUserAnniversaryPreference, ); + // Default to true if the preference is not set + const birthdayPreferenceValue = birthdayPreference !== false; + const anniversaryPreferenceValue = anniversaryPreference !== false; + const [updatePreference, {loading, error}] = useUpsertAssociatePreferenceMutation({ context: { @@ -104,7 +108,7 @@ export const PrivacyPreferences = ( labelOff={t('privacyPreferences.birthdayLabel')} descriptionOn={t('privacyPreferences.birthdayDesc')} descriptionOff={t('privacyPreferences.birthdayDesc')} - value={birthdayPreference !== false} + value={birthdayPreferenceValue} icon={<Icon name={'birthdayCakePreference'} />} onToggle={() => updatePreference({ @@ -113,7 +117,7 @@ export const PrivacyPreferences = ( walmartIdentificationNumber: winNumber!, meAtWalmartPreferences: { displayPreferences: { - birthday: Boolean(!birthdayPreference), + birthday: !birthdayPreferenceValue, }, }, }, @@ -131,7 +135,7 @@ export const PrivacyPreferences = ( labelOff={t('privacyPreferences.anniversaryLabel')} descriptionOn={t('privacyPreferences.anniversaryDesc')} descriptionOff={t('privacyPreferences.anniversaryDesc')} - value={anniversaryPreference !== false} + value={anniversaryPreferenceValue} icon={<Icon name={'anniversaryPrivacy'} />} onToggle={() => updatePreference({ @@ -140,7 +144,7 @@ export const PrivacyPreferences = ( walmartIdentificationNumber: winNumber!, meAtWalmartPreferences: { displayPreferences: { - anniversary: Boolean(!anniversaryPreference), + anniversary: !anniversaryPreferenceValue, }, }, },
fix: privacy preference toggle wasnt working for intial toggle off
fix: privacy preference toggle wasnt working for intial toggle off
9a048748ae895662c0627e980747552a7316213b
--- packages/allspark-foundation-hub/__tests__/HubFeature/supplyChain/ShiftFilter.test.tsx @@ -45,4 +45,13 @@ describe('ShiftFilter', () => { expect(getByTestId('teamImage-shiftFilter')).toBeTruthy(); expect(toJSON()).toMatchSnapshot(); }); + + it('Test 2: Calls handleSelectShift when pressed', () => { + const { getByTestId } = render(<ShiftFilter {...mockShiftFilterProps} />); + const touchable = getByTestId('shift-filter-shift123'); + fireEvent.press(touchable); + expect(mockShiftFilterProps.handleSelectShift).toHaveBeenCalledWith( + 'shift123' + ); + }); });
Adding Test 2 for shiftFilter
Adding Test 2 for shiftFilter
864657bfa0cd53b7454e510aa82b07fcdd3fb2e8
--- __tests__/navigation/__snapshots__/TabBarTest.tsx.snap @@ -7,16 +7,16 @@ exports[`TabBar renders 1`] = ` Object { "alignContent": "center", "backgroundColor": "white", - "elevation": 4, + "elevation": 15, "flexDirection": "row", "shadowColor": "black", "shadowOffset": Object { - "height": -3, + "height": 0, "width": 0, }, "shadowOpacity": 0.15, - "shadowRadius": 4, - "zIndex": 4, + "shadowRadius": 10, + "zIndex": 15, }, Object { "paddingBottom": 0, --- ios/AllSpark/Info.plist @@ -108,5 +108,7 @@ </array> <key>UIViewControllerBasedStatusBarAppearance</key> <false/> + <key>UIUserInterfaceStyle</key> + <string>Light</string> </dict> </plist> --- src/navigation/NavigationStyle.ts @@ -7,6 +7,8 @@ const primaryBlue = Colors.blue['100']; export default StyleSheet.create({ primaryHeader: { backgroundColor: primaryBlue, + shadowOffset: {width: 0, height: 0}, + elevation: 0, }, headerTitleContainer: { left: 56, @@ -14,7 +16,6 @@ export default StyleSheet.create({ headerTitle: { fontFamily: 'Bogle-Bold', fontSize: 18, - fontWeight: 'bold', }, menuButton: { paddingVertical: 8, --- src/navigation/TabBarStyle.ts @@ -5,12 +5,12 @@ export default StyleSheet.create({ backgroundColor: 'white', flexDirection: 'row', alignContent: 'center', - elevation: 4, - zIndex: 4, + elevation: 15, + zIndex: 15, shadowColor: 'black', shadowOpacity: 0.15, - shadowOffset: {width: 0, height: -3}, - shadowRadius: 4, + shadowOffset: {width: 0, height: 0}, + shadowRadius: 10, }, tabButton: { flex: 1,
Fix/core vqa (#159)
Fix/core vqa (#159) * fix title font; adjustments for tab bar shadow * update snapshots * disable dark mode for the app Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com>
c65650e4fe6b262798224c2c533960b94e6916bc
--- ios/Podfile.lock @@ -538,7 +538,7 @@ PODS: - RCTTypeSafety - React - ReactCommon/turbomodule/core - - react-native-scanner-3.0 (0.2.1): + - react-native-scanner-3.0 (0.1.32): - Firebase/Analytics - React - ScanditBarcodeCapture (= 6.14.0) @@ -1225,7 +1225,7 @@ SPEC CHECKSUMS: react-native-ptt-module: 47e1b73551afa3830155cc92f4809d06c38e5eca react-native-render-html: 984dfe2294163d04bf5fe25d7c9f122e60e05ebe react-native-safe-area-context: 6c12e3859b6f27b25de4fee8201cfb858432d8de - react-native-scanner-3.0: 357a5d88bc757579087ef0d2ce2001b17b6e323b + react-native-scanner-3.0: a0549e6f451262c91e545d3b69a6b9d8cf2ac1eb react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457 react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253 react-native-view-shot: 792829857bbb23a9c8acdad9a640554bdee397a3 --- package-lock.json @@ -42,7 +42,7 @@ "@walmart/core-services-allspark": "~2.10.8", "@walmart/core-utils": "~2.0.5", "@walmart/core-widget-registry": "~1.2.2", - "@walmart/counts-component-miniapp": "0.1.4", + "@walmart/counts-component-miniapp": "0.1.2", "@walmart/emergency-mini-app": "1.23.2", "@walmart/exception-mini-app": "1.2.4", "@walmart/facilities-management-miniapp": "0.6.7", @@ -69,7 +69,7 @@ "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", "@walmart/react-native-logger": "1.33.0", - "@walmart/react-native-scanner-3.0": "0.2.2", + "@walmart/react-native-scanner-3.0": "0.1.32", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.5.1", @@ -5012,14 +5012,18 @@ } }, "node_modules/@walmart/counts-component-miniapp": { - "version": "0.1.4", + "version": "0.1.2", + "resolved": "https://npme.walmart.com/@walmart/counts-component-miniapp/-/counts-component-miniapp-0.1.2.tgz", + "integrity": "sha512-/MvR5ACBMHVTgVtBgQ8lYQAQc1dMgfvNQ2n4XdgbXSyi9PLVNJjr89WTh1h9YBJxtihmwMMhx66cP3TVqZal6A==", "hasInstallScript": true, "peerDependencies": { + "@react-native-community/async-storage": "^1.12.1", + "@react-native-community/netinfo": "9.3.6", "@react-navigation/native": "^6.0.0", "@react-navigation/stack": "^6.1.0", "@walmart/core-services-allspark": "~1.10.11", "@walmart/core-utils": "~1.3.0", - "@walmart/gtp-shared-components": "2.0.2", + "@walmart/gtp-shared-components": "^2.0.0", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/redux-store": "^3.1.3", "i18next": "^22.0.1", @@ -5764,9 +5768,9 @@ } }, "node_modules/@walmart/react-native-scanner-3.0": { - "version": "0.2.2", - "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.2.2.tgz", - "integrity": "sha512-ANEpLi25XetK2Otj1N+TGiSMP60W+/hcCLsIHgJ3kU8M2ciwLwv+ibPFYbuxQngjkQPfQpUGynPSbg13sIHaEg==", + "version": "0.1.32", + "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.1.32.tgz", + "integrity": "sha512-eTnQ4DX9rb8YNbj7tfn4iqRuiQotY3YNEJXDOm17/F4IbQ3/raWQgRArVvFAXswMz/pnSfIN7cqJEgUKlYX66Q==", "license": "ISC", "peerDependencies": { "react-native": ">=0.47.1" @@ -25140,7 +25144,9 @@ } }, "@walmart/counts-component-miniapp": { - "version": "0.1.4" + "version": "0.1.2", + "resolved": "https://npme.walmart.com/@walmart/counts-component-miniapp/-/counts-component-miniapp-0.1.2.tgz", + "integrity": "sha512-/MvR5ACBMHVTgVtBgQ8lYQAQc1dMgfvNQ2n4XdgbXSyi9PLVNJjr89WTh1h9YBJxtihmwMMhx66cP3TVqZal6A==" }, "@walmart/emergency-mini-app": { "version": "1.23.2", @@ -25297,9 +25303,9 @@ "version": "1.33.0" }, "@walmart/react-native-scanner-3.0": { - "version": "0.2.2", - "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.2.2.tgz", - "integrity": "sha512-ANEpLi25XetK2Otj1N+TGiSMP60W+/hcCLsIHgJ3kU8M2ciwLwv+ibPFYbuxQngjkQPfQpUGynPSbg13sIHaEg==" + "version": "0.1.32", + "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.1.32.tgz", + "integrity": "sha512-eTnQ4DX9rb8YNbj7tfn4iqRuiQotY3YNEJXDOm17/F4IbQ3/raWQgRArVvFAXswMz/pnSfIN7cqJEgUKlYX66Q==" }, "@walmart/react-native-shared-navigation": { "version": "1.0.2", --- package.json @@ -84,7 +84,7 @@ "@walmart/core-services-allspark": "~2.10.8", "@walmart/core-utils": "~2.0.5", "@walmart/core-widget-registry": "~1.2.2", - "@walmart/counts-component-miniapp": "0.1.4", + "@walmart/counts-component-miniapp": "0.1.2", "@walmart/emergency-mini-app": "1.23.2", "@walmart/exception-mini-app": "1.2.4", "@walmart/facilities-management-miniapp": "0.6.7", @@ -111,7 +111,7 @@ "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", "@walmart/react-native-logger": "1.33.0", - "@walmart/react-native-scanner-3.0": "0.2.2", + "@walmart/react-native-scanner-3.0": "0.1.32", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.5.1",
build(version): remove scanner & count widget latest version
build(version): remove scanner & count widget latest version
4e33930caca48695fb33cd3feda2187060919bfc
--- package-lock.json @@ -55,7 +55,7 @@ "@walmart/gtp-shared-components": "2.0.6", "@walmart/impersonation-mini-app": "1.20.0-145-f14b734", "@walmart/ims-print-services-ui": "2.4.1", - "@walmart/inbox-mini-app": "0.85.0-426-250b0ab", + "@walmart/inbox-mini-app": "0.85.0-426-6c90f5e", "@walmart/iteminfo-mini-app": "7.3.4", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-field-mini-app": "12.0.25", @@ -5354,9 +5354,9 @@ } }, "node_modules/@walmart/inbox-mini-app": { - "version": "0.85.0-426-250b0ab", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.85.0-426-250b0ab.tgz", - "integrity": "sha512-SjuU3l0Zva9bJlca7iGAKUux9EXu37RRmZlusIIOr1JxaZ3gcukX/ybSIzwiFNR0YscRJWsgI5SzE6qu6CB7Ug==", + "version": "0.85.0-426-6c90f5e", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.85.0-426-6c90f5e.tgz", + "integrity": "sha512-Epl9hqN5i4ocHBUD/rSsbTKlKDe8JGyRCh1viVhCWLo+l4Rkue9sKbar+pWGick2W/j6Z0k8m3t1iZ/ZVVHsQA==", "dependencies": { "@shopify/flash-list": "^1.4.3", "@walmart/moment-walmart": "^1.0.4", @@ -25310,9 +25310,9 @@ "version": "2.4.1" }, "@walmart/inbox-mini-app": { - "version": "0.85.0-426-250b0ab", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.85.0-426-250b0ab.tgz", - "integrity": "sha512-SjuU3l0Zva9bJlca7iGAKUux9EXu37RRmZlusIIOr1JxaZ3gcukX/ybSIzwiFNR0YscRJWsgI5SzE6qu6CB7Ug==", + "version": "0.85.0-426-6c90f5e", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.85.0-426-6c90f5e.tgz", + "integrity": "sha512-Epl9hqN5i4ocHBUD/rSsbTKlKDe8JGyRCh1viVhCWLo+l4Rkue9sKbar+pWGick2W/j6Z0k8m3t1iZ/ZVVHsQA==", "requires": { "@shopify/flash-list": "^1.4.3", "@walmart/moment-walmart": "1.0.4", --- package.json @@ -97,7 +97,7 @@ "@walmart/gtp-shared-components": "2.0.6", "@walmart/impersonation-mini-app": "1.20.0-145-f14b734", "@walmart/ims-print-services-ui": "2.4.1", - "@walmart/inbox-mini-app": "0.85.0-426-250b0ab", + "@walmart/inbox-mini-app": "0.85.0-426-6c90f5e", "@walmart/iteminfo-mini-app": "7.3.4", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-field-mini-app": "12.0.25",
platform bug fixes
platform bug fixes
81a3aaf1647210b3efcf3de148ae1860ac9ae3b3
--- package-lock.json @@ -37,7 +37,7 @@ "@terrylinla/react-native-sketch-canvas": "0.8.0", "@walmart/allspark-graphql-client": "^1.4.5", "@walmart/allspark-neon-core": "0.1.31", - "@walmart/amp-mini-app": "1.1.52", + "@walmart/amp-mini-app": "1.1.48", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.13.4", "@walmart/attendance-mini-app": "0.190.6", @@ -52,7 +52,7 @@ "@walmart/emergency-mini-app": "1.26.1", "@walmart/exception-mini-app": "1.5.1", "@walmart/facilities-management-miniapp": "0.6.67", - "@walmart/feedback-all-spark-miniapp": "0.9.48", + "@walmart/feedback-all-spark-miniapp": "0.9.43", "@walmart/financial-wellbeing-feature-app": "1.10.4", "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16", @@ -7895,9 +7895,9 @@ } }, "node_modules/@walmart/amp-mini-app": { - "version": "1.1.52", - "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.52.tgz", - "integrity": "sha512-Vc88NXoj7I7RrtI7kow4kDH8VKlyTLvPP0/hG0pPEwXpebX94Aavyo+TT1KK18c0WPiL3qmaayghv4UpbjZvkQ==", + "version": "1.1.48", + "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.48.tgz", + "integrity": "sha512-wqMIYsV87EZsMfTE/wbuiB/Xa3t5uQgZNYvBVqPnuZFGRAmg9j3mwVg/LnCpwNmLIaHtE798x43ZIV8h9gjXYQ==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -8332,9 +8332,9 @@ } }, "node_modules/@walmart/feedback-all-spark-miniapp": { - "version": "0.9.48", - "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.9.48.tgz", - "integrity": "sha512-aJzdl4g6cOcNQhHvtcmkWrczuEeU/pkrkL6qJpPa+cq1LnfWQQpLlEM/h0WWVA2rKgXNOSkvDPADBD2+nkb+Nw==", + "version": "0.9.43", + "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.9.43.tgz", + "integrity": "sha512-6/R50+Ga6eY7nIqreH8m7KmNEXPz1kQ8DO6/l8J6aGHvTuLRZeFHAH8h3ZsvuWip8/0xUqwd4nyRsd/aeA/g5A==", "peerDependencies": { "@react-native-async-storage/async-storage": "^1.19.0", "@react-native-community/datetimepicker": "^6.1.3", @@ -33448,9 +33448,9 @@ } }, "@walmart/amp-mini-app": { - "version": "1.1.52", - "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.52.tgz", - "integrity": "sha512-Vc88NXoj7I7RrtI7kow4kDH8VKlyTLvPP0/hG0pPEwXpebX94Aavyo+TT1KK18c0WPiL3qmaayghv4UpbjZvkQ==" + "version": "1.1.48", + "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.48.tgz", + "integrity": "sha512-wqMIYsV87EZsMfTE/wbuiB/Xa3t5uQgZNYvBVqPnuZFGRAmg9j3mwVg/LnCpwNmLIaHtE798x43ZIV8h9gjXYQ==" }, "@walmart/ask-sam-chat-components": { "version": "0.2.13", @@ -33599,9 +33599,9 @@ "integrity": "sha512-vAn11SgL6thiZdZLdAe1EvJ+gYGSDJa2HBrLPXlTFQgUHtf2+fnnj4SG9bX8mg9/Ax3Hg7IQaiKle3GsdgN2ww==" }, "@walmart/feedback-all-spark-miniapp": { - "version": "0.9.48", - "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.9.48.tgz", - "integrity": "sha512-aJzdl4g6cOcNQhHvtcmkWrczuEeU/pkrkL6qJpPa+cq1LnfWQQpLlEM/h0WWVA2rKgXNOSkvDPADBD2+nkb+Nw==" + "version": "0.9.43", + "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.9.43.tgz", + "integrity": "sha512-6/R50+Ga6eY7nIqreH8m7KmNEXPz1kQ8DO6/l8J6aGHvTuLRZeFHAH8h3ZsvuWip8/0xUqwd4nyRsd/aeA/g5A==" }, "@walmart/financial-wellbeing-feature-app": { "version": "1.10.4", --- package.json @@ -78,7 +78,7 @@ "@terrylinla/react-native-sketch-canvas": "0.8.0", "@walmart/allspark-graphql-client": "^1.4.5", "@walmart/allspark-neon-core": "0.1.31", - "@walmart/amp-mini-app": "1.1.52", + "@walmart/amp-mini-app": "1.1.48", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.13.4", "@walmart/attendance-mini-app": "0.190.6", @@ -93,7 +93,7 @@ "@walmart/emergency-mini-app": "1.26.1", "@walmart/exception-mini-app": "1.5.1", "@walmart/facilities-management-miniapp": "0.6.67", - "@walmart/feedback-all-spark-miniapp": "0.9.48", + "@walmart/feedback-all-spark-miniapp": "0.9.43", "@walmart/financial-wellbeing-feature-app": "1.10.4", "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16",
Platform Components Upgrade
Platform Components Upgrade
05c7fba92e0b4c27afb77da66bfd0ccee315c4fd
--- package-lock.json @@ -3354,9 +3354,9 @@ "integrity": "sha512-jplu8SFzqVj1xWNlxMrPmR3oelBdyNBeQHJOr5YM7p7yqAWBiYO2jt9HyUkZCzRkEhrjjDufk9J5K9OJC1GhKA==" }, "@walmart/iteminfo-mini-app": { - "version": "1.0.17", - "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-1.0.17.tgz", - "integrity": "sha512-q29a/g7ym27zNvROhL7fTerTq5SFLn0PL3TnEAGHdUVQ+QomEv1jiASBJOksqeDyZrHWFegSLbRUMwHNAKJGcg==", + "version": "1.0.19", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-1.0.19.tgz", + "integrity": "sha512-lVL+eXkQeTL7Psti3GOQwT2P4osAS5t83bxZXz44qMwE63ndvBh3QWSmMyuSjj5OlL/1EHHHppgp0GrO0P+jfA==", "requires": { "react-native-chart-kit": "6.6.1" } --- package.json @@ -76,7 +76,7 @@ "@walmart/impersonation-mini-app": "1.0.15", "@walmart/ims-print-services-ui": "0.0.19", "@walmart/inbox-mini-app": "0.0.96", - "@walmart/iteminfo-mini-app": "1.0.17", + "@walmart/iteminfo-mini-app": "1.0.19", "@walmart/manager-approvals-miniapp": "0.0.40", "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.5.21",
ItemInfo adding extra space for back button and adding a flag for shelfcap edit
ItemInfo adding extra space for back button and adding a flag for shelfcap edit
d77bd0bfe7e74628444ab736d489cf68410c558f
--- package.json @@ -90,7 +90,7 @@ "@walmart/redux-store": "3.7.0", "@walmart/ui-components": "1.15.1", "@walmart/wmconnect-mini-app": "1.2.0", - "@walmart/roster-mini-app": "2.1.0", + "@walmart/roster-mini-app": "2.2.0", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0",
feat(ui): updating wmconnect and roster versions smdv-5695
feat(ui): updating wmconnect and roster versions smdv-5695
7e0115623f9bd46aec9075d813f96203b5ed726c
--- package.json @@ -101,7 +101,7 @@ "@walmart/backroom-mini-app": "1.17.7", "@walmart/beneficiary-online-mini-app": "0.1.26", "@walmart/beneficiary-online-shared-library": "1.2.7", - "@walmart/calling-mini-app": "0.8.27", + "@walmart/calling-mini-app": "0.8.29", "@walmart/candidate-authentication-lib": "0.0.12", "@walmart/celebration-mini-app": "1.35.0", "@walmart/checkout-mini-app": "4.19.0", @@ -156,7 +156,7 @@ "@walmart/react-native-shared-navigation": "~6.3.28", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.9.0-aplha.1", - "@walmart/react-native-webex-sdk": "0.9.24", + "@walmart/react-native-webex-sdk": "0.9.25", "@walmart/receipt-check-miniapp": "1.34.11", "@walmart/redux-store": "~6.3.28", "@walmart/returns-mini-app": "4.17.28", --- yarn.lock @@ -7679,9 +7679,9 @@ __metadata: languageName: node linkType: hard -"@walmart/calling-mini-app@npm:0.8.27": - version: 0.8.27 - resolution: "@walmart/calling-mini-app@npm:0.8.27::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fcalling-mini-app%2F-%2F%40walmart%2Fcalling-mini-app-0.8.27.tgz" +"@walmart/calling-mini-app@npm:0.8.29": + version: 0.8.29 + resolution: "@walmart/calling-mini-app@npm:0.8.29::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fcalling-mini-app%2F-%2F%40walmart%2Fcalling-mini-app-0.8.29.tgz" peerDependencies: "@react-native-community/datetimepicker": ">=5" "@react-navigation/native": ">=6" @@ -7727,7 +7727,7 @@ __metadata: dependenciesMeta: "@walmart/wmconnect-mini-app": built: false - checksum: 10c0/a912b40cad1f15fa26879c08b1e4a68ee3342d305be865669bbdc91e8959d5f751509452d23443fa525eb5814382d784e24f9cf4ac15e3b6efd7254eeded92da + checksum: 10c0/8bb4d910fd09dd12f4bdf5cd3b6d80bf80c1151dd613de2ccf11e65ca49ae0206ff58c6a592126e5c27506c513ab7869b3e8b59acaf83a0a661b95176c67762d languageName: node linkType: hard @@ -8499,7 +8499,7 @@ __metadata: "@walmart/backroom-mini-app": "npm:1.17.7" "@walmart/beneficiary-online-mini-app": "npm:0.1.26" "@walmart/beneficiary-online-shared-library": "npm:1.2.7" - "@walmart/calling-mini-app": "npm:0.8.27" + "@walmart/calling-mini-app": "npm:0.8.29" "@walmart/candidate-authentication-lib": "npm:0.0.12" "@walmart/celebration-mini-app": "npm:1.35.0" "@walmart/checkout-mini-app": "npm:4.19.0" @@ -8554,7 +8554,7 @@ __metadata: "@walmart/react-native-shared-navigation": "npm:~6.3.28" "@walmart/react-native-store-map": "npm:0.3.7" "@walmart/react-native-sumo-sdk": "npm:2.9.0-aplha.1" - "@walmart/react-native-webex-sdk": "npm:0.9.24" + "@walmart/react-native-webex-sdk": "npm:0.9.25" "@walmart/receipt-check-miniapp": "npm:1.34.11" "@walmart/redux-store": "npm:~6.3.28" "@walmart/returns-mini-app": "npm:4.17.28" @@ -9144,14 +9144,14 @@ __metadata: languageName: node linkType: hard -"@walmart/react-native-webex-sdk@npm:0.9.24": - version: 0.9.24 - resolution: "@walmart/react-native-webex-sdk@npm:0.9.24::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freact-native-webex-sdk%2F-%2F%40walmart%2Freact-native-webex-sdk-0.9.24.tgz" +"@walmart/react-native-webex-sdk@npm:0.9.25": + version: 0.9.25 + resolution: "@walmart/react-native-webex-sdk@npm:0.9.25::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freact-native-webex-sdk%2F-%2F%40walmart%2Freact-native-webex-sdk-0.9.25.tgz" peerDependencies: react: "*" react-native: "*" react-native-logger: "*" - checksum: 10c0/189008006e8d46e52a6a8578ae82d8e7c48a97b380318a60bcdb1a4b0f2f9fc62d8f036bf1b6d07a33b0a7e796e890994062bf1ca5cc08b4e74668f859a07a23 + checksum: 10c0/772c4ed819bfd3f5119da3a759637df659d0170f25471c19917e90de6c262409c7fbc1234985c1f5b8abfde688d2bc927b2eca6250cbb469627cf0fa170b1dac languageName: node linkType: hard
Calling Drop 35 UI/Navigation related bug fixes (#5190)
Calling Drop 35 UI/Navigation related bug fixes (#5190) Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com>
9cee423b4b0be13f0f1d01e96cfd44d9588f62d3
--- src/containers/ChannelRow.tsx @@ -27,6 +27,7 @@ import { } from '../utils/channel'; import firestore from '@react-native-firebase/firestore'; import {useUnreadForChannel} from '../context/UnreadContext'; +import moment from 'moment-timezone'; const styles = StyleSheet.create({ item: { @@ -112,12 +113,17 @@ export const ChannelRow = (props: ChannelRowProps) => { const unsubscribeMessages = firestore() .doc(channelPath) .collection('messages') - .where('sentFrom', 'not-in', [viewerId]) + .where('createdAt', '>', moment().subtract(7, 'day').toDate()) + .limit(100) + .orderBy('createdAt', 'desc') .onSnapshot( (snapshot) => { if (!snapshot.empty) { - const notRead = snapshot.docs.reduce((total, message) => { - return message.data().readBy?.[viewerId!] ? total : total + 1; + const notRead = snapshot.docChanges().reduce((total, message) => { + const data = message.doc.data(); + return data.sentFrom === viewerId || data.readBy?.[viewerId!] + ? total + : total + 1; }, 0); setUnread(notRead); } --- src/context/UnreadContext.tsx @@ -7,6 +7,7 @@ import React, { useState, } from 'react'; import {noop} from 'lodash'; +import {Badge} from '@walmart/gtp-shared-components'; const UnreadContext = createContext<{ unread: number; @@ -56,3 +57,13 @@ export const useUnreadForChannel = (channel: string) => { setUnread: (count: number) => setUnreadForChannel(channel, count), }; }; + +export const UnreadBadge = () => { + const {unread} = useUnread(); + + return unread ? ( + <Badge UNSAFE_style={{marginLeft: 4}} color='spark'> + {unread} + </Badge> + ) : null; +}; --- src/screens/MessagesScreen.tsx @@ -28,6 +28,7 @@ import { } from '../utils'; import {ChatInput} from '../containers/ChatInput'; import {Message} from '../containers/Message'; +import moment from 'moment-timezone'; const styles = StyleSheet.create({ container: { @@ -157,6 +158,7 @@ export const MessagesScreen = () => { const unsubscribeMessages = channelDocument .collection('messages') .orderBy('createdAt', 'desc') + .where('createdAt', '>', moment().subtract(7, 'day').toDate()) .limit(PAGE_SIZE) .onSnapshot( (snapshot) => { --- src/screens/TabsScreen.tsx @@ -1,4 +1,4 @@ -import React, {createContext} from 'react'; +import React from 'react'; import {createMaterialTopTabNavigator} from '@react-navigation/material-top-tabs'; import {StackNavigationProp} from '@react-navigation/stack'; @@ -7,8 +7,7 @@ import {TextingNavParamsMap} from '../navigation/types'; import {UserHeader} from '../containers/UserHeader'; import {RosterScreen} from './RosterScreen'; import {ChannelsScreen} from './ChannelsScreen'; -import {Badge} from '@walmart/gtp-shared-components/dist'; -import {useUnread} from '../context/UnreadContext'; +import {UnreadBadge} from '../context/UnreadContext'; type TabsScreenProps = { navigation: StackNavigationProp<TextingNavParamsMap>; @@ -16,16 +15,6 @@ type TabsScreenProps = { const MainTab = createMaterialTopTabNavigator(); -const TextMessageBadge = () => { - const {unread} = useUnread(); - - return unread ? ( - <Badge UNSAFE_style={{marginLeft: 4}} color='spark'> - {unread} - </Badge> - ) : null; -}; - export const TabsScreen: React.FC<TabsScreenProps> = () => { return ( <> @@ -41,7 +30,7 @@ export const TabsScreen: React.FC<TabsScreenProps> = () => { name='Text Messages' options={{ lazy: true, - tabBarBadge: TextMessageBadge, + tabBarBadge: UnreadBadge, }} component={ChannelsScreen} /> --- src/containers/ChannelRow.tsx @@ -27,6 +27,7 @@ import { } from '../utils/channel'; import firestore from '@react-native-firebase/firestore'; import {useUnreadForChannel} from '../context/UnreadContext'; +import moment from 'moment-timezone'; const styles = StyleSheet.create({ item: { @@ -112,12 +113,17 @@ export const ChannelRow = (props: ChannelRowProps) => { const unsubscribeMessages = firestore() .doc(channelPath) .collection('messages') - .where('sentFrom', 'not-in', [viewerId]) + .where('createdAt', '>', moment().subtract(7, 'day').toDate()) + .limit(100) + .orderBy('createdAt', 'desc') .onSnapshot( (snapshot) => { if (!snapshot.empty) { - const notRead = snapshot.docs.reduce((total, message) => { - return message.data().readBy?.[viewerId!] ? total : total + 1; + const notRead = snapshot.docChanges().reduce((total, message) => { + const data = message.doc.data(); + return data.sentFrom === viewerId || data.readBy?.[viewerId!] + ? total + : total + 1; }, 0); setUnread(notRead); } --- src/context/UnreadContext.tsx @@ -7,6 +7,7 @@ import React, { useState, } from 'react'; import {noop} from 'lodash'; +import {Badge} from '@walmart/gtp-shared-components'; const UnreadContext = createContext<{ unread: number; @@ -56,3 +57,13 @@ export const useUnreadForChannel = (channel: string) => { setUnread: (count: number) => setUnreadForChannel(channel, count), }; }; + +export const UnreadBadge = () => { + const {unread} = useUnread(); + + return unread ? ( + <Badge UNSAFE_style={{marginLeft: 4}} color='spark'> + {unread} + </Badge> + ) : null; +}; --- src/screens/MessagesScreen.tsx @@ -28,6 +28,7 @@ import { } from '../utils'; import {ChatInput} from '../containers/ChatInput'; import {Message} from '../containers/Message'; +import moment from 'moment-timezone'; const styles = StyleSheet.create({ container: { @@ -157,6 +158,7 @@ export const MessagesScreen = () => { const unsubscribeMessages = channelDocument .collection('messages') .orderBy('createdAt', 'desc') + .where('createdAt', '>', moment().subtract(7, 'day').toDate()) .limit(PAGE_SIZE) .onSnapshot( (snapshot) => { --- src/screens/TabsScreen.tsx @@ -1,4 +1,4 @@ -import React, {createContext} from 'react'; +import React from 'react'; import {createMaterialTopTabNavigator} from '@react-navigation/material-top-tabs'; import {StackNavigationProp} from '@react-navigation/stack'; @@ -7,8 +7,7 @@ import {TextingNavParamsMap} from '../navigation/types'; import {UserHeader} from '../containers/UserHeader'; import {RosterScreen} from './RosterScreen'; import {ChannelsScreen} from './ChannelsScreen'; -import {Badge} from '@walmart/gtp-shared-components/dist'; -import {useUnread} from '../context/UnreadContext'; +import {UnreadBadge} from '../context/UnreadContext'; type TabsScreenProps = { navigation: StackNavigationProp<TextingNavParamsMap>; @@ -16,16 +15,6 @@ type TabsScreenProps = { const MainTab = createMaterialTopTabNavigator(); -const TextMessageBadge = () => { - const {unread} = useUnread(); - - return unread ? ( - <Badge UNSAFE_style={{marginLeft: 4}} color='spark'> - {unread} - </Badge> - ) : null; -}; - export const TabsScreen: React.FC<TabsScreenProps> = () => { return ( <> @@ -41,7 +30,7 @@ export const TabsScreen: React.FC<TabsScreenProps> = () => { name='Text Messages' options={{ lazy: true, - tabBarBadge: TextMessageBadge, + tabBarBadge: UnreadBadge, }} component={ChannelsScreen} />
feat: add further filtering and limitation on message queries
feat: add further filtering and limitation on message queries
abadb790a4b105c8a67d05153f248dc3d2994879
--- __tests__/settings/sideButton/__snapshots__/SideButtonPermissionBottomSheetTest.tsx.snap @@ -14,15 +14,10 @@ exports[`Side button permission bottom sheet tests matches snapshot 1`] = ` <View style={ { - "backgroundColor": "rgba(0, 0, 0, 0.4)", - "bottom": 0, - "height": 1334, - "left": 0, - "opacity": 0.00011425836668732536, - "position": "absolute", - "right": 0, - "top": 0, - "width": 750, + "alignContent": "center", + "alignItems": "center", + "flexDirection": "column", + "justifyContent": "flex-start", } } >
chore: test snapshot update
chore: test snapshot update
5cfbc14ce6ba8e6336f2f3afb4287fb1a983166d
--- __tests__/harness/index.tsx @@ -5,7 +5,7 @@ import {Provider as ReduxProvider} from 'react-redux'; import {reducerManager} from '@walmart/redux-store'; import {PreloadedState} from 'redux'; import {configureStore} from '@reduxjs/toolkit'; -import {initialStateMock} from './redux/mockState'; +const {initialStateMock} = require('./redux/mockState'); import {I18nextProvider, initReactI18next} from 'react-i18next'; import i18n from 'i18next'; import {enUS} from '../../src/translations/en-US'; @@ -18,15 +18,15 @@ import {IChannelsContext} from '../../src/channels'; import {ChannelsContext} from '../../src/channels/context'; import {PresenceContext} from '../../src/presence/context'; import {IPresenceContext} from '../../src/presence/types'; -import {createMockChannelsContext} from './firestore/channelsProvider'; -import {createMockPresenceContext} from './firestore/presenceProvider'; +const {createMockChannelsContext} = require('./firestore/channelsProvider'); +const {createMockPresenceContext} = require('./firestore/presenceProvider'); import { MockedProvider as MockAthenaProvider, MockedResponse, } from '@apollo/client/testing'; -import {mockGetDailyRosterQuery} from './athenaQueries/getDailyRoster'; -import {mockGetTeamsByStoreQuery} from './athenaQueries/getTeamsByStore'; -import {mockGetTeamByIdQuery} from './athenaQueries/getTeamById'; +const {mockGetDailyRosterQuery} = require('./athenaQueries/getDailyRoster'); +const {mockGetTeamsByStoreQuery} = require('./athenaQueries/getTeamsByStore'); +const {mockGetTeamByIdQuery} = require('./athenaQueries/getTeamById'); import {textingSlice} from '../../src/redux/reducer'; reducerManager.addReducer('texting', textingSlice.reducer); --- __tests__/harness/index.tsx @@ -5,7 +5,7 @@ import {Provider as ReduxProvider} from 'react-redux'; import {reducerManager} from '@walmart/redux-store'; import {PreloadedState} from 'redux'; import {configureStore} from '@reduxjs/toolkit'; -import {initialStateMock} from './redux/mockState'; +const {initialStateMock} = require('./redux/mockState'); import {I18nextProvider, initReactI18next} from 'react-i18next'; import i18n from 'i18next'; import {enUS} from '../../src/translations/en-US'; @@ -18,15 +18,15 @@ import {IChannelsContext} from '../../src/channels'; import {ChannelsContext} from '../../src/channels/context'; import {PresenceContext} from '../../src/presence/context'; import {IPresenceContext} from '../../src/presence/types'; -import {createMockChannelsContext} from './firestore/channelsProvider'; -import {createMockPresenceContext} from './firestore/presenceProvider'; +const {createMockChannelsContext} = require('./firestore/channelsProvider'); +const {createMockPresenceContext} = require('./firestore/presenceProvider'); import { MockedProvider as MockAthenaProvider, MockedResponse, } from '@apollo/client/testing'; -import {mockGetDailyRosterQuery} from './athenaQueries/getDailyRoster'; -import {mockGetTeamsByStoreQuery} from './athenaQueries/getTeamsByStore'; -import {mockGetTeamByIdQuery} from './athenaQueries/getTeamById'; +const {mockGetDailyRosterQuery} = require('./athenaQueries/getDailyRoster'); +const {mockGetTeamsByStoreQuery} = require('./athenaQueries/getTeamsByStore'); +const {mockGetTeamByIdQuery} = require('./athenaQueries/getTeamById'); import {textingSlice} from '../../src/redux/reducer'; reducerManager.addReducer('texting', textingSlice.reducer);
fix ts errors in harness
fix ts errors in harness
0b4b2c64ba01a1512610ef694ffad1bb5c42c17f
--- android/app/build.gradle @@ -134,7 +134,7 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 70 + versionCode 71 versionName "1.0.5" } splits { --- ios/AllSpark/Info.plist @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>70</string> + <string>71</string> <key>LSApplicationQueriesSchemes</key> <array> <string>invmgmt</string> --- ios/AllSparkTests/Info.plist @@ -19,6 +19,6 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>70</string> + <string>71</string> </dict> </plist>
Incrementing build number
Incrementing build number
a94968b87ef4e6403f55b416ce7aa983e492443e
--- src/components/AssociateRosterItem/index.tsx @@ -52,12 +52,12 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { SiteSelectors.getUserWorkingSite, ); const currentUser = useSelector(UserSelectors.getUser) as Associate; - const shouldShowStatusChipAndWeeklySchedule: boolean = + const shouldShowStatusChipAndWeeklySchedule: boolean | undefined = useRbacConfigWithJobCode(); const userIsInRoster = useUserIsInRoster(); const isPushToTalkEnabled: boolean = useSelector(pushToTalkEnabled); const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled); - const userIsImpersonatedOnDev: boolean = useIsImpersonatedOnDev(); + const userIsImpersonatedOnDev: boolean | undefined = useIsImpersonatedOnDev(); const countryCode: string | undefined = useSelector( SiteSelectors.getSiteCountry, ); @@ -70,7 +70,7 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { const encryptedId = encryptUserId(associate?.win?.toString() ?? ''); const {height} = StyleSheet.flatten(style || {}); const name = associateDisplayName(associate); - const associateName = namecase(name.slice(0, 20)); + const associateName = namecase(name?.slice(0, 20)); const isClockedIn = associateIsClockedIn(associate); const handleIndividualSchedulePress = () => @@ -116,7 +116,7 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { <ListItem testID='associateRosterListItem' UNSAFE_style={[styles.item, {height}, last && styles.lastItem]} - title={namecase(name.slice(0, 20))} + title={namecase(name?.slice(0, 20))} leading={ <ClockStatusIndicator isClockedIn={isClockedIn} --- src/components/Roster/AssociateListItem.tsx @@ -54,7 +54,7 @@ export const AssociateListItem: React.FC<AssociateListItemProps> = React.memo( SiteSelectors.getSiteCountry, ); - const shouldShowStatusChipAndWeeklySchedule: boolean = + const shouldShowStatusChipAndWeeklySchedule: boolean | undefined = useRbacConfigWithJobCode(); const userIsInRoster = useUserIsInRoster(); @@ -63,7 +63,7 @@ export const AssociateListItem: React.FC<AssociateListItemProps> = React.memo( const participants: string[] = [viewerId, encryptedId]; const associateName = namecase( - associateDisplayName(associate).slice(0, 20), + associateDisplayName(associate)?.slice(0, 20), ); const isStoreScheduleValid = associate?.storeSchedule && associate?.storeSchedule?.length > 0; --- src/containers/RosterFilters.tsx @@ -55,7 +55,8 @@ export const RosterFilters = (props: { const {absentCount, associates, clockedInCount, tardyCount, onFilter} = props; const {t} = useTranslation([ROSTER_I18N_NAMESPACE]); - const isAllFilterChipsVisible: boolean = useRbacConfigWithJobCode(); + const isAllFilterChipsVisible: boolean | undefined = + useRbacConfigWithJobCode(); // Used for reference, does not need to trigger render const selectedFilter = useRef<FilterValue>(FilterValue.all); --- src/containers/StoreChatCard.tsx @@ -48,7 +48,7 @@ export const StoreChatCard = (props: {style?: StyleProp<ViewStyle>}) => { const navigation = useNavigation<StackNavigationProp<TextingNavParamsMap>>(); const isPushToTalkEnabled: boolean = useSelector(pushToTalkEnabled); const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled); - const userIsImpersonatedOnDev: boolean = useIsImpersonatedOnDev(); + const userIsImpersonatedOnDev: boolean | undefined = useIsImpersonatedOnDev(); const associateData = useDailyRoster(); const rosterData = associateData.data?.getDailyRoster || []; const translationContext = useSiteTranslationContext(); --- src/screens/SearchScreen.tsx @@ -130,7 +130,7 @@ export const SearchScreen: React.FC<SearchScreenProps> = (props) => { i18nLabel: t('rosterScreen.associateRosterItem.messageBtn'), action: (associateRosterItem) => { const name = associateDisplayName(associate); - const associateName = namecase(name.slice(0, 20)); + const associateName = namecase(name?.slice(0, 20)); dispatch(rosterSlice.actions.SET_SEARCH_TEXT('')); storeAssociateName(associateName); navigateToMessageScreen(storeId, associateRosterItem);
Adding type updates
Adding type updates
3e1c8f566197505d3e1ac78f3ec0cdd946c33af0
--- core/src/features/feedback.ts @@ -28,7 +28,6 @@ import { IMeAtWalmartEnvironment, InboxContainer, NAVIGATE_HOME, - withRefreshKey, } from '@walmart/me-at-walmart-common'; import {createRestartableSagas} from '@walmart/allspark-utils'; @@ -125,10 +124,7 @@ export const FeedbackFeature = new AllsparkFeatureModule('feedback', { }); // Add survey says card to the home dashboard - HomeDashboardContainer.add( - 'SurveySaysCard', - withRefreshKey('survey', SurveySaysCard), - ); + HomeDashboardContainer.add('SurveySaysCard', SurveySaysCard); // Add survey says card to the inbox InboxContainer.add('feedbackSurvey', SurveySaysInboxCard); --- core/src/features/receiving.tsx @@ -4,7 +4,6 @@ import { FeatureTags, HomeDashboardContainer, HomeWidgetProps, - withRefreshKey, } from '@walmart/me-at-walmart-common'; import {useNavigation} from '@react-navigation/native'; @@ -37,7 +36,7 @@ export const ReceivingFeature = new AllsparkFeatureModule('receiving', { // Add receiving widget to home dashboard container HomeDashboardContainer.add( 'UnifiedReceivingCard', - withRefreshKey('receiving', UnifiedReceivingCard), + UnifiedReceivingCard, ); }, }, --- core/src/features/sidekick.tsx @@ -7,7 +7,6 @@ import { FeatureTags, HomeDashboardContainer, HomeWidgetProps, - withRefreshKey, } from '@walmart/me-at-walmart-common'; import {getBottomNavConfigMap} from '../navigation/USHallway/AssociateHallwayNav/Tabs/config'; @@ -44,10 +43,7 @@ export const SidekickFeature = new AllsparkFeatureModule('sidekick', { const SidekickCard = createSidekickCard(); // Add sidekick widget to home dashboard container - HomeDashboardContainer.add( - 'SidekickCard', - withRefreshKey('sidekick', SidekickCard), - ); + HomeDashboardContainer.add('SidekickCard', SidekickCard); }, }, }, --- core/src/home/containers/HomeScreen/index.tsx @@ -11,7 +11,10 @@ import {UserSelectors} from '@walmart/allspark-foundation/User'; import {AllsparkComponentContainers} from '@walmart/allspark-foundation/Components'; import {noop} from '@walmart/allspark-utils'; -import {HomeDashboardContainer} from '@walmart/me-at-walmart-common'; +import { + HomeDashboardContainer, + HomeWidgetProps, +} from '@walmart/me-at-walmart-common'; import {Body, colors} from '@walmart/gtp-shared-components'; import {WalmartRefreshControl} from '../../components/WalmartRefreshControl'; @@ -46,13 +49,13 @@ export const HomeScreen: React.FC<Props> = (props) => { const isCelebrating = useSelector(getIsCelebrationDay); const [state, setState] = useState<{ - refreshTime: string | null; + refreshTime: string; refreshing: boolean; - lastRefresh: string | null; + lastRefresh: string; }>({ - refreshTime: null, + refreshTime: '', refreshing: false, - lastRefresh: null, + lastRefresh: '', }); const parentSiteID = useRef(currentSiteId); @@ -96,12 +99,13 @@ export const HomeScreen: React.FC<Props> = (props) => { lastUpdatedTimeout.current = setTimeout(stopRefreshing, 3500); }; - const cotainerComponentProps = useMemo( + const homeWidgetProps: HomeWidgetProps = useMemo( () => ({ refresh: state.refreshTime, - onRefreshStart: noop, - onRefreshEnd: noop, style: styles.cardStyle, + onRefreshStart: noop, // backwards compat + onRefreshEnd: noop, // backwards compat + refreshKey: 'deprecated', // backwards compat }), [state.refreshTime], ); @@ -169,9 +173,7 @@ export const HomeScreen: React.FC<Props> = (props) => { <HomeDashboardContainer.Layout layout={layout} scrollable={false} - // @ts-ignore - purposefully passing refresh as a date string to trigger refresh on widgets - // without having to flip state in parent - props={cotainerComponentProps} + props={homeWidgetProps} /> </ScrollView> <TemporaryHomeContainer.List /> --- packages/me-at-walmart-common/src/components/Home.tsx @@ -1,33 +1,26 @@ -import React, {ComponentType} from 'react'; import {StyleProp, ViewStyle} from 'react-native'; import {AllsparkComponentContainers} from '@walmart/allspark-foundation/Components'; export interface HomeWidgetProps { - refresh: boolean; + refresh: string; + style?: StyleProp<ViewStyle>; /** - * @deprecated - determine refreshKey, use in refresh callbacks, within component itself. + * @deprecated */ refreshKey?: string; - onRefreshStart: (key: string) => void; - onRefreshEnd: (key: string) => void; - style?: StyleProp<ViewStyle>; + /** + * @deprecated + */ + onRefreshStart?: (key: string) => void; + /** + * @deprecated + */ + onRefreshEnd?: (key: string) => void; } export const HOME_DASHBOARD_KEY = 'home_dashboard'; export const HOME_HEADER_RIGHT_KEY = 'home_header_right'; -/** - * @deprecated - Home components should not be dependent on refreshKey coming from the container. The component - * should determine its own key and use it for the callbacks. - * - * Use to build a home dashboard component with a given refreshKey. - */ -export const withRefreshKey = - <T extends HomeWidgetProps>(id: string, Component: ComponentType<T>) => - (props: HomeWidgetProps) => { - return <Component {...(props as T)} refreshKey={id} />; - }; - /** * Component container for home screen dashboard components. *
refactor: remove uneeded refresh key hoc and explicity mark old props as deprecated
refactor: remove uneeded refresh key hoc and explicity mark old props as deprecated
fe7b205e1b1fb165593d78a85d5d193772f06eb6
--- package-lock.json @@ -3052,9 +3052,9 @@ } }, "@walmart/impersonation-mini-app": { - "version": "1.0.7", - "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.0.7.tgz", - "integrity": "sha512-V85jGOfE+5JauAKvH8gSGvp9vauVj6Pu8Gemj1vm511mlnnct4m5rezB67qGOyIiIdWxAvf4qjSj9662MOsLFQ==" + "version": "1.0.9", + "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.0.9.tgz", + "integrity": "sha512-7QKyLMpYGKM8/bdbhtkehZ3qG+EY4qbsTxln64eWso/hBFirAAelhzR1wGm0VITOvDetFrGbSNnqpow+lJFiAw==" }, "@walmart/inbox-mini-app": { "version": "0.0.44", @@ -3157,9 +3157,9 @@ } }, "@walmart/settings-mini-app": { - "version": "1.1.12", - "resolved": "https://npme.walmart.com/@walmart/settings-mini-app/-/settings-mini-app-1.1.12.tgz", - "integrity": "sha512-BAt1o+HxymOArDQgOizPt7B2itxi3LOwWFVS2+HH5Izat3wwqIsAZIOVEiOUkJtYALMlzm5uvAlteQLcUWhr+Q==" + "version": "1.1.14", + "resolved": "https://npme.walmart.com/@walmart/settings-mini-app/-/settings-mini-app-1.1.14.tgz", + "integrity": "sha512-SsYeWcxxTEepE6j5VXuLED8z5GrloWsUXcF9+G8vq3pZz12x8zCsADRdCT/nXVGhWvgbN8IxJ0f3J1AoihtqDA==" }, "@walmart/time-clock-mini-app": { "version": "0.1.18", --- package.json @@ -54,7 +54,7 @@ "@walmart/feedback-all-spark-miniapp": "0.0.31", "@walmart/functional-components": "^1.0.22", "@walmart/gtp-shared-components": "^0.2.2", - "@walmart/impersonation-mini-app": "1.0.7", + "@walmart/impersonation-mini-app": "1.0.9", "@walmart/inbox-mini-app": "0.0.44", "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.0.76", @@ -63,7 +63,7 @@ "@walmart/react-native-shared-navigation": "^0.3.0", "@walmart/redux-store": "^1.0.11", "@walmart/schedule-mini-app": "0.2.54", - "@walmart/settings-mini-app": "1.1.12", + "@walmart/settings-mini-app": "1.1.14", "@walmart/time-clock-mini-app": "0.1.18", "@walmart/ui-components": "1.0.91", "@walmart/welcomeme-mini-app": "0.5.27",
impersonation and settings version bmp (#294)
impersonation and settings version bmp (#294) * impersonation and settings version bmp * terms of use font issue Co-authored-by: Anthony Helms - awhelms <awhelms@wal-mart.com>
757cf9295cf9aa9398a70ed303b574171120fbf6
--- .gitignore @@ -57,6 +57,7 @@ buck-out/ */fastlane/Preview.html */fastlane/screenshots */fastlane/fastlane-session.json +*/fastlane/report.xml # Bundle artifact *.jsbundle --- .looper.multibranch.yml @@ -268,12 +268,9 @@ flows: increment-version-code: - (name Check Versioning) git clone https://${GITHUB_TOKEN}@gecgithub01.walmart.com/allspark/allspark-core-version.git -b master - (set version code) bundle exec fastlane set_build - - (get version code) bundle exec fastlane get_android_version_code + - exposeVars(./fastlane/fastlane-session.json) + - echo "Android version code ${fastlane-session.android_version_code}" - var(GIT_DIRECTORY = "allspark-core-version") - - dir(fastlane): - - exposeVars(fastlane-session.json) - - echo "Android version code ${fastlane-session.android_version_code}" - - echo "Android version code ${fastlane-session.version_code}" - | (name Set Versioning) cd ${GIT_DIRECTORY} @@ -499,8 +496,10 @@ flows: # @param betacrashPIN - pin for this build slack-success: - exposeVars(./betacrash.json) + - exposeVars(./fastlane/fastlane-session.json) + - echo "Android version code ${fastlane-session.android_version_code}" - var(BUILD_NUMBER): - sh scripts/getIOSAppBundleNumber.sh ios/AllSpark/Info.plist + echo "${fastlane-session.android_version_code}" - var(MESSAGE_TITLE): echo "${slackIcon} ${osIcon} ${releaseType} ${version}" - echo "betacrashUrl ${betacrash.url}" --- fastlane/Fastfile @@ -33,25 +33,13 @@ private_lane :set_android do |values| ) end -desc 'Android: Get Version Code' -lane :get_android_version_code do - puts android_get_version_code( - gradle_file: "#{ANDROID_PROJECT}" - ) - UI.message "-------------------------------------------" - session[:android_version_code]=Actions.lane_context[SharedValues::ANDROID_VERSION_CODE] - save_session - UI.message "-------------------------------------------" - -end - desc 'Evaluate and Set Build Number and Version Code' lane :set_build do version_json = read_json(json_path: "#{VERSION_PATH}") version_json[:build] += 1 UI.message "-------------------------------------------" - session[:version_code]=version_json[:build] + session[:android_version_code]=version_json[:build] save_session UI.message "-------------------------------------------" --- fastlane/README.md @@ -15,14 +15,9 @@ Install _fastlane_ using or alternatively using `brew install fastlane` # Available Actions -### get_android_version_code -``` -fastlane get_android_version_code -``` -Android: Get Version Code ### set_build ``` -fastlane set_build +bundle exec fastlane set_build ``` Evaluate and Set Build Number and Version Code --- fastlane/report.xml @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<testsuites> - <testsuite name="fastlane.lanes"> - - - - - <testcase classname="fastlane.lanes" name="0: read_json" time="0.000445"> - - </testcase> - - - <testcase classname="fastlane.lanes" name="1: Switch to set_ios lane" time="0.000167"> - - </testcase> - - - <testcase classname="fastlane.lanes" name="2: ios_set_build_number" time="0.778441"> - - </testcase> - - - <testcase classname="fastlane.lanes" name="3: Switch to set_android lane" time="0.000188"> - - </testcase> - - - <testcase classname="fastlane.lanes" name="4: android_set_version_code" time="0.002126"> - - </testcase> - - - <testcase classname="fastlane.lanes" name="5: write_json" time="0.000546"> - - </testcase> - - </testsuite> -</testsuites>
added code to get android version code for slack builds
added code to get android version code for slack builds
816de7cf6421e4e5210183643615939cfc3d1e9b
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.26.0", + "version": "1.27.0", "main": "dist/index.js", "files": [ "dist/"
feat: SMDV-9999 update package
feat: SMDV-9999 update package
c1f1db06f7dea498864f94eaa112c0252ad3bf11
--- scripts/mini-app-scan/package-deprecation/legacy-library-deprecated.json @@ -1,50 +1 @@ -[ - { - "legacyLibrary": "@walmart/core-services", - "replacement": "@walmart/allspark-foundation", - "enforcementDate": "2025-08-22", - "notes": "Use the foundation replacement for all new development." - }, - { - "legacyLibrary": "@walmart/core-utils", - "replacement": "@walmart/allspark-utils", - "enforcementDate": "2025-08-22", - "notes": "Use the foundation replacement for all new development." - }, - { - "legacyLibrary": "@walmart/react-native-env", - "replacement": "@walmart/allspark-foundation/Environment", - "enforcementDate": "2025-08-22", - "notes": "Use the foundation replacement for all new development." - }, - { - "legacyLibrary": "@walmart/react-native-shared-navigation", - "replacement": "@walmart/allspark-foundation/Navigation", - "enforcementDate": "2025-08-22", - "notes": "Use the foundation replacement for all new development." - }, - { - "legacyLibrary": "@walmart/react-native-wm-network", - "replacement": "@walmart/allspark-foundation/Network", - "enforcementDate": "2025-08-22", - "notes": "Use the foundation replacement for all new development." - }, - { - "legacyLibrary": "@walmart/react-native-wm-notification", - "replacement": "@walmart/allspark-foundation/Notification", - "enforcementDate": "2025-08-22", - "notes": "Use the foundation replacement for all new development." - }, - { - "legacyLibrary": "@walmart/redux-store", - "replacement": "@walmart/allspark-foundation/Redux", - "enforcementDate": "2025-08-22", - "notes": "Use the foundation replacement for all new development." - }, - { - "legacyLibrary": "@walmart/functional-components", - "replacement": "@walmart/allspark-foundation/HTTP", - "enforcementDate": "2025-08-22", - "notes": "Use the foundation replacement for all new development." - } -] +[] \ No newline at end of file --- scripts/mini-app-scan/package-deprecation/scheduled-library-deprecation.json @@ -1 +1,51 @@ -[] \ No newline at end of file +[ + { + "legacyLibrary": "@walmart/core-services", + "replacement": "@walmart/allspark-foundation", + "enforcementDate": "2025-09-15", + "notes": "Use the foundation replacement for all new development." + }, + { + "legacyLibrary": "@walmart/core-utils", + "replacement": "@walmart/allspark-utils", + "enforcementDate": "2025-09-15", + "notes": "Use the foundation replacement for all new development." + }, + { + "legacyLibrary": "@walmart/react-native-env", + "replacement": "@walmart/allspark-foundation/Environment", + "enforcementDate": "2025-09-15", + "notes": "Use the foundation replacement for all new development." + }, + { + "legacyLibrary": "@walmart/react-native-shared-navigation", + "replacement": "@walmart/allspark-foundation/Navigation", + "enforcementDate": "2025-09-15", + "notes": "Use the foundation replacement for all new development." + }, + { + "legacyLibrary": "@walmart/react-native-wm-network", + "replacement": "@walmart/allspark-foundation/Network", + "enforcementDate": "2025-09-15", + "notes": "Use the foundation replacement for all new development." + }, + { + "legacyLibrary": "@walmart/react-native-wm-notification", + "replacement": "@walmart/allspark-foundation/Notification", + "enforcementDate": "2025-09-15", + "notes": "Use the foundation replacement for all new development." + }, + { + "legacyLibrary": "@walmart/redux-store", + "replacement": "@walmart/allspark-foundation/Redux", + "enforcementDate": "2025-09-15", + "notes": "Use the foundation replacement for all new development." + }, + { + "legacyLibrary": "@walmart/functional-components", + "replacement": "@walmart/allspark-foundation/HTTP", + "enforcementDate": "2025-09-15", + "notes": "Use the foundation replacement for all new development." + } +] +
feat(package-dep): adjust dates
feat(package-dep): adjust dates
a8d3a971ee74b1c7fd4530ac794281309ecb903b
--- packages/allspark-foundation/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation", - "version": "6.39.0", + "version": "6.40.0", "description": "", "main": "Core/index.js", "types": "Core/index.d.ts", --- packages/allspark-utils/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-utils", - "version": "6.7.0", + "version": "6.8.0", "description": "", "author": "rlane1 <russell.lane@walmart.com>", "homepage": "",
chore: manually bump package version for release
chore: manually bump package version for release
9455316f1f36c7e5450d7bdbd96d89415ef14d31
--- docs/CHANGELOG.md @@ -1,3 +1,11 @@ +# [2.31.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.30.0...v2.31.0) (2025-05-01) + + +### Features + +* **ui:** display alert on data error ([7c18532](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/7c18532ca2e8dd30d201ee283256d99bddaec8f1)) +* **ui:** update lint ([91d792f](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/91d792fe29043afeb15a8cf4d49eca4dbf9deab4)) + # [2.30.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.29.0...v2.30.0) (2025-05-01) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.30.0", + "version": "2.31.0", "main": "dist/index.js", "files": [ "dist/"
chore(release): 2.31.0 [skip ci]
chore(release): 2.31.0 [skip ci] # [2.31.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.30.0...v2.31.0) (2025-05-01) ### Features * **ui:** display alert on data error ([7c18532](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/7c18532ca2e8dd30d201ee283256d99bddaec8f1)) * **ui:** update lint ([91d792f](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/91d792fe29043afeb15a8cf4d49eca4dbf9deab4))
48bf3ee1f9ef4d1020332a62389431a7771d1c73
--- .looper.multibranch.yml @@ -282,8 +282,8 @@ flows: - echo "slackChannel ${slackChannel}" - echo "buildType ${buildType}" - echo "workspace is ${WORKSPACE}" - - echo "podfile lock is ${WORKSPACE}/ios/Podfile.lock" - - ls -l "${WORKSPACE}/ios/Podfile.lock" + # - echo "podfile lock is ${WORKSPACE}/ios/Podfile.lock" + # - ls -l "${WORKSPACE}/ios/Podfile.lock" - call: pr - call: setup-fastlane - call: increment-version-code
ignore ios podfile temporarily
ignore ios podfile temporarily
22d6b79fbf47111be1fd45cae9dd9f55c2dd121d
--- src/screens/MessagesScreen.tsx @@ -14,7 +14,7 @@ import {Body, colors, Spinner} from '@walmart/gtp-shared-components'; import {MessagesHeader, MessageTimeSectionHeader} from '../components'; import {FirebaseMessage, LocalMessage, MessageRequest} from '../types'; import {TextingNavParamsMap} from '../navigation'; -import {convertEmojisToUnicode, createMessageList, decryptUserId} from '../utils'; +import {createMessageList, decryptUserId} from '../utils'; import {ChatInput} from '../containers/ChatInput'; import {Message} from '../containers/Message'; import {useChannelData, useChannelDocument} from '../channels/hooks'; @@ -235,9 +235,6 @@ export const MessagesScreen: FC<MessagesScreenProps> = (props) => { } }; - - - const sendPushNotification = async (message: MessageRequest) => { if (!isNil(siteId)) { const getMessageTextForPush = () => { --- src/screens/MessagesScreen.tsx @@ -14,7 +14,7 @@ import {Body, colors, Spinner} from '@walmart/gtp-shared-components'; import {MessagesHeader, MessageTimeSectionHeader} from '../components'; import {FirebaseMessage, LocalMessage, MessageRequest} from '../types'; import {TextingNavParamsMap} from '../navigation'; -import {convertEmojisToUnicode, createMessageList, decryptUserId} from '../utils'; +import {createMessageList, decryptUserId} from '../utils'; import {ChatInput} from '../containers/ChatInput'; import {Message} from '../containers/Message'; import {useChannelData, useChannelDocument} from '../channels/hooks'; @@ -235,9 +235,6 @@ export const MessagesScreen: FC<MessagesScreenProps> = (props) => { } }; - - - const sendPushNotification = async (message: MessageRequest) => { if (!isNil(siteId)) { const getMessageTextForPush = () => {
revert changes to messagesScreen
revert changes to messagesScreen
43dcb0a55cd2b8f846016855a0485b2fe1725259
--- package.json @@ -89,7 +89,7 @@ "@walmart/counts-component-miniapp": "0.0.42", "@walmart/emergency-mini-app": "1.15.0", "@walmart/exception-mini-app": "1.0.14", - "@walmart/facilities-management-miniapp": "0.4.2-beta48", + "@walmart/facilities-management-miniapp": "0.4.2-beta49", "@walmart/feedback-all-spark-miniapp": "0.9.9", "@walmart/financial-wellbeing-feature-app": "1.0.64", "@walmart/functional-components": "2.0.6",
Update package.json 0.4.2-beta49
Update package.json 0.4.2-beta49
8c148f63ab2a0e5ecc0f953fd41658788371207b
--- targets/US/package.json @@ -140,7 +140,7 @@ "@walmart/redux-store": "~6.3.28", "@walmart/returns-mini-app": "4.15.0", "@walmart/rfid-scan-mini-app": "2.4.4", - "@walmart/rn-receiving-mini-app": "2.3.365", + "@walmart/rn-receiving-mini-app": "2.3.375", "@walmart/roster-mini-app": "2.9.0", "@walmart/schedule-mini-app": "0.118.2", "@walmart/shelfavailability-mini-app": "1.5.37", --- yarn.lock @@ -6667,9 +6667,9 @@ __metadata: languageName: node linkType: hard -"@walmart/loadquality-mini-app@npm:1.0.140": - version: 1.0.140 - resolution: "@walmart/loadquality-mini-app@npm:1.0.140" +"@walmart/loadquality-mini-app@npm:1.0.141": + version: 1.0.141 + resolution: "@walmart/loadquality-mini-app@npm:1.0.141" peerDependencies: "@react-navigation/native": ^6.0.0 "@react-navigation/stack": ^6.1.0 @@ -6678,7 +6678,7 @@ __metadata: axios-cache-adapter: ">=2.7.3" react: ^18.2.0 react-native: ~0.70.5 - checksum: 10c0/33f26f35ffb13b6328a04f8f4f47636445f6e8f615fb0b1932a303522f2ec422ee5d24a06134edd3d810f9b1a91aab67094753710145b5d3d6161960da4ab283 + checksum: 10c0/3e1905cdad103f8cbd0e7307948fe9fe75b1bfee16535da357099f81dc69e5157a9889ea427fd865d37e7d61f45e6761f21159106e8b263f1193df938dde8b9b languageName: node linkType: hard @@ -7056,7 +7056,7 @@ __metadata: "@walmart/redux-store": "npm:~6.3.28" "@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.365" + "@walmart/rn-receiving-mini-app": "npm:2.3.375" "@walmart/roster-mini-app": "npm:2.9.0" "@walmart/schedule-mini-app": "npm:0.118.2" "@walmart/shelfavailability-mini-app": "npm:1.5.37" @@ -7769,12 +7769,12 @@ __metadata: languageName: node linkType: hard -"@walmart/rn-receiving-mini-app@npm:2.3.365": - version: 2.3.365 - resolution: "@walmart/rn-receiving-mini-app@npm:2.3.365" +"@walmart/rn-receiving-mini-app@npm:2.3.375": + version: 2.3.375 + resolution: "@walmart/rn-receiving-mini-app@npm:2.3.375" dependencies: "@walmart/atlas-rn-ui-components": "npm:1.1.17" - "@walmart/loadquality-mini-app": "npm:1.0.140" + "@walmart/loadquality-mini-app": "npm:1.0.141" peerDependencies: "@react-native-clipboard/clipboard": ">=1.14.0" "@react-navigation/native": ^6.0.8 @@ -7797,7 +7797,7 @@ __metadata: react-native-svg: ">=14.1.0" react-native-svg-transformer: ">=1.1.0" react-native-vision-camera: ^2.16.8 - checksum: 10c0/6733d5b03ac5e61951037a95ba256efdc5b162487e7eaf9ff1dfb0fb22bf026ca683418c38721a2d3579210aeb7a550ecee0f0b79a147a37603b693c2440ee91 + checksum: 10c0/cd8d7d72d7c8c15d6d78dcc50e28922d5505f96341fa0981bc61f2b493171ce411d86b476bb17a78745a2a1e7d7d81ecee96ec26f1899f0879867b81a1cee480 languageName: node linkType: hard
Receiving version - 2.3.375 - Bug fixes
Receiving version - 2.3.375 - Bug fixes
9028faf45735061375d3538daa0426d789f6797c
--- graphql.yml @@ -61,29 +61,29 @@ applications: queryTemplate: 'src/queries/supplyChainTeamsByBusinessUnit.graphql' tags: - 'v1' - # - name: "prod" - # persistedQueries: - # - name: "GetDailyRoster" - # queryTemplate: "src/queries/getDailyRoster.graphql" - # tags: - # - "v2" - # - name: "GetSupplyChainShifts" - # queryTemplate: "src/queries/getSupplyChainShifts.graphql" - # tags: - # - "v1" - # - name: "GetSupplyChainTeamById" - # queryTemplate: "src/queries/getSupplyChainTeamById.graphql" - # tags: - # - "v1" - # - name: "GetTeamById" - # queryTemplate: "src/queries/getTeamById.graphql" - # tags: - # - "v2" - # - name: "GetTeamsByStore" - # queryTemplate: "src/queries/getTeamsbyStore.graphql" - # tags: - # - "v2" - # - name: "SupplyChainTeamsByBusinessUnit" - # queryTemplate: "src/queries/supplyChainTeamsByBusinessUnit.graphql" - # tags: - # - "v1" + - name: "prod" + persistedQueries: + - name: "GetDailyRoster" + queryTemplate: "src/queries/getDailyRoster.graphql" + tags: + - "v2" + - name: "GetSupplyChainShifts" + queryTemplate: "src/queries/getSupplyChainShifts.graphql" + tags: + - "v1" + - name: "GetSupplyChainTeamById" + queryTemplate: "src/queries/getSupplyChainTeamById.graphql" + tags: + - "v1" + - name: "GetTeamById" + queryTemplate: "src/queries/getTeamById.graphql" + tags: + - "v2" + - name: "GetTeamsByStore" + queryTemplate: "src/queries/getTeamsbyStore.graphql" + tags: + - "v2" + - name: "SupplyChainTeamsByBusinessUnit" + queryTemplate: "src/queries/supplyChainTeamsByBusinessUnit.graphql" + tags: + - "v1"
Update the graphql yml
Update the graphql yml
c9a2254b5e123c2b99c2a5c8d3ded4a02a635c16
--- targets/US/ios/AllSpark.xcodeproj/project.pbxproj @@ -468,7 +468,6 @@ "${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/PromisesSwift/Promises_Privacy.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/RNCAsyncStorage/RNCAsyncStorage_resources.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/RNDeviceInfo/RNDeviceInfoPrivacyInfo.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle", "${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf", "${PODS_ROOT}/../../../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf", @@ -496,7 +495,6 @@ "${PODS_ROOT}/../../../../node_modules/@walmart/native-rfid-scanner/ios/resources/complete.mp3", "${PODS_ROOT}/../../../../node_modules/@walmart/native-rfid-scanner/ios/resources/error.mp3", "${PODS_ROOT}/../../../../node_modules/@walmart/native-rfid-scanner/ios/resources/pop.mp3", - "${PODS_CONFIGURATION_BUILD_DIR}/react-native-blob-util/ReactNativeBlobUtilPrivacyInfo.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/react-native-scanner-3.0/WMScannerResources.bundle", "${PODS_ROOT}/../../../../node_modules/react-native-wm-voice-text/ios/state-change_confirm-down.wav", "${PODS_ROOT}/../../../../node_modules/react-native-wm-voice-text/ios/state-change_confirm-up.wav", @@ -517,7 +515,6 @@ "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Promises_Privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNCAsyncStorage_resources.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNDeviceInfoPrivacyInfo.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf", @@ -545,7 +542,6 @@ "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/complete.mp3", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/error.mp3", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/pop.mp3", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ReactNativeBlobUtilPrivacyInfo.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WMScannerResources.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/state-change_confirm-down.wav", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/state-change_confirm-up.wav", --- targets/US/ios/Podfile.lock @@ -2926,4 +2926,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 79762e92a369aa18acfab74237463b207180b823 -COCOAPODS: 1.14.3 \ No newline at end of file +COCOAPODS: 1.14.3
reverted podfile lock
reverted podfile lock
e6c42fc4bdfa29fc4b8c860c51e6bcb11afd0682
--- .looper.yml @@ -33,11 +33,12 @@ flows: pr: - (name Boostrap) npm install - (name Lint) npm run lint - # - (name Test) npm run test + - (name Build and Test) npm run test:build preparePublish: - (name Install Dependencies) npm install - (name Build) npm run build + - (name Test) npm run test publishPatch: - call: preparePublish --- package.json @@ -14,6 +14,7 @@ "scripts": { "init": "npm i --workspaces", "test": "jest", + "test:build": "npm run build && jest", "coverage": "jest --coverage", "lint": "npm run lint --workspaces --if-present", "lint:fix": "npm run lint:fix --workspaces --if-present",
chore: update looper template for test
chore: update looper template for test
66bdc386db028d1d47b20da35bec09e1c750091b
--- .looper.yml @@ -2,6 +2,7 @@ inherit: 'job:///metropolis/metroloop/metroloop-parent' tools: nodejs: 20.10.0 + npm: 10.9.2 jdk: flavor: azul version: 17
chore(ui): update changes for celebration mini app
chore(ui): update changes for celebration mini app
64ce92ec5b1c6a08f8280e6d1e1610e9db5b9edd
--- package-lock.json @@ -17518,7 +17518,7 @@ }, "moment": { "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "resolved": "https://npme.walmart.com/moment/-/moment-2.29.4.tgz", "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==" }, "moment-timezone": {
update package-lock.json
update package-lock.json
c251d5a94abe23013d1e3f1558e72c4e80fc332a
--- .looper.multibranch.yml @@ -4,7 +4,7 @@ inherit: "job:///metropolis/metroloop/metroloop-parent" ## Whenever you update the nodes, please update it at the two-place, below line & the global variable LOOPER_NODES ## -node: ((stable_osx||xcode12.5)&&!MAC-LAB-MINI36&&!MAC-LAB-MINI32&&!MAC-LAB-MINI07&&!MAC-DRFQLAB-MINI43) +node: ((stable_osx||xcode12.5)&&!MAC-LAB-MINI36&&!MAC-LAB-MINI32&&!MAC-LAB-MINI07&&!MAC-DRFQLAB-MINI43&&!MAC-LAB-MINI09) tools: android:
restricting node
restricting node
eff48ad8ecb8aae056d37a3dc5d1047e2c19eaf1
--- .eslintrc.js @@ -1,5 +1,5 @@ module.exports = { - extends: ['expo'], + extends: ['expo', 'prettier'], ignorePatterns: ['/dist', 'src/allspark-extension.types.ts', 'src/index.ts'], rules: { '@typescript-eslint/no-unused-vars': [ @@ -10,17 +10,6 @@ module.exports = { }, ], 'no-debugger': 'error', - // Formatting rules disabled to avoid conflicts with Prettier - 'eol-last': 'off', - indent: 'off', - 'space-in-parens': 'off', - 'no-trailing-spaces': 'off', - 'array-bracket-spacing': 'off', - 'object-curly-spacing': 'off', - quotes: 'off', - 'jsx-quotes': 'off', - 'comma-dangle': 'off', - semi: 'off', }, globals: { JSX: true, --- package.json @@ -101,6 +101,7 @@ "babel-jest": "^29.6.3", "eslint": "8.56.0", "eslint-config-expo": "~8.0.1", + "eslint-config-prettier": "^10.1.5", "expo": "~52.0.46", "expo-build-properties": "~0.13.3", "expo-doctor": "^1.10.1", --- scripts/.eslintrc.js @@ -2,4 +2,5 @@ module.exports = { env: { node: true, }, + extends: ['prettier'], }; --- yarn.lock @@ -6221,6 +6221,7 @@ __metadata: babel-jest: "npm:^29.6.3" eslint: "npm:8.56.0" eslint-config-expo: "npm:~8.0.1" + eslint-config-prettier: "npm:^10.1.5" expo: "npm:~52.0.46" expo-build-properties: "npm:~0.13.3" expo-doctor: "npm:^1.10.1" @@ -9155,6 +9156,17 @@ __metadata: languageName: node linkType: hard +"eslint-config-prettier@npm:^10.1.5": + version: 10.1.5 + resolution: "eslint-config-prettier@npm:10.1.5::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Feslint-config-prettier%2F-%2Feslint-config-prettier-10.1.5.tgz" + peerDependencies: + eslint: ">=7.0.0" + bin: + eslint-config-prettier: bin/cli.js + checksum: 10c0/5486255428e4577e8064b40f27db299faf7312b8e43d7b4bc913a6426e6c0f5950cd519cad81ae24e9aecb4002c502bc665c02e3b52efde57af2debcf27dd6e0 + languageName: node + linkType: hard + "eslint-import-resolver-node@npm:^0.3.9": version: 0.3.9 resolution: "eslint-import-resolver-node@npm:0.3.9::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Feslint-import-resolver-node%2F-%2Feslint-import-resolver-node-0.3.9.tgz"
feat(ui): setup eslint-config-prettier #SMDV-8201
feat(ui): setup eslint-config-prettier #SMDV-8201
5ad226d7d76e6975a500332abeaa59b758dcdaec
--- package.json @@ -391,7 +391,7 @@ "@walmart/react-native-sumo-sdk": "2.6.4", "@walmart/receipt-check-miniapp": "1.19.3", "@walmart/redux-store": "6.0.0", - "@walmart/returns-mini-app": "3.13.0", + "@walmart/returns-mini-app": "4.6.0", "@walmart/schedule-mini-app": "0.93.0", "@walmart/shelfavailability-mini-app": "1.5.20", "@walmart/store-feature-orders": "1.26.5",
Update override version
Update override version
0e8177ab0bac4c7226b12f7340b2531d56e808b7
--- __tests__/__mocks__/@walmart/iteminfo-mini-app.js --- package.json @@ -66,18 +66,18 @@ "@redux-saga/testing-utils": "^1.1.3", "@sharcoux/slider": "^5.2.1", "@terrylinla/react-native-sketch-canvas": "^0.8.0", - "@walmart/ItemInfo": "0.1.161", + "@walmart/iteminfo-mini-app": "0.1.1", "@walmart/allspark-health-survey-mini-app": "0.0.38", "@walmart/allspark-home-mini-app": "0.4.0", "@walmart/allspark-me-mini-app": "0.1.0", "@walmart/ask-sam-mini-app": "0.23.0", "@walmart/config-components": "1.0.21", - "@walmart/counts-component-miniapp": "0.0.4", + "@walmart/counts-component-miniapp": "0.0.9", "@walmart/feedback-all-spark-miniapp": "0.0.50", "@walmart/functional-components": "1.0.27", - "@walmart/gtp-shared-components": "^1.1.3", + "@walmart/gtp-shared-components": "^1.1.5", "@walmart/impersonation-mini-app": "1.0.15", - "@walmart/ims-print-services-ui": "^0.0.15", + "@walmart/ims-print-services-ui": "0.0.16", "@walmart/inbox-mini-app": "0.0.94", "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.5.9", --- src/core/versionsInit.ts @@ -16,7 +16,7 @@ const miniApps = [ '@walmart/time-clock-mini-app', '@walmart/feedback-all-spark-miniapp', '@walmart/settings-mini-app', - '@walmart/ItemInfo', + '@walmart/iteminfo-mini-app', '@walmart/inbox-mini-app', '@walmart/welcomeme-mini-app', 'react-native-ssmp-sso-allspark', --- src/navigation/AssociateHallwayNav/index.tsx @@ -15,7 +15,7 @@ import { import {ScheduleMiniApp} from '@walmart/schedule-mini-app'; import {HealthSurveyMiniApp} from '@walmart/allspark-health-survey-mini-app'; import SettingsMiniApp from '@walmart/settings-mini-app'; -import {ItemInfoMiniApp} from '@walmart/ItemInfo'; +import {ItemInfoMiniApp} from '@walmart/iteminfo-mini-app'; import ImpersonationMiniApp from '@walmart/impersonation-mini-app'; import {Components, Properties} from '@walmart/push-to-talk-mini-app'; import {FeedbackMiniApp} from '@walmart/feedback-all-spark-miniapp'; --- src/translations/en-US.ts @@ -9,7 +9,7 @@ export const enUS = { '@walmart/schedule-mini-app': 'Schedules', '@walmart/time-clock-mini-app': 'Time Clock', '@walmart/settings-mini-app': 'Settings', - '@walmart/ItemInfo': 'Item information', + '@walmart/iteminfo-mini-app': 'Item information', '@walmart/feedback-all-spark-miniapp': 'Feedback', '@walmart/inbox-mini-app': 'Inbox', '@walmart/welcomeme-mini-app': 'Welcome Me', --- src/translations/es-MX.ts @@ -9,7 +9,7 @@ export const esMX = { '@walmart/schedule-mini-app': 'Schedules', '@walmart/time-clock-mini-app': 'Time Clock', '@walmart/settings-mini-app': 'Settings', - '@walmart/ItemInfo': 'Item information', + '@walmart/iteminfo-mini-app': 'Item information', '@walmart/feedback-all-spark-miniapp': 'Feedback', '@walmart/inbox-mini-app': 'Inbox', '@walmart/welcomeme-mini-app': 'Welcome Me',
iteminfo-mini-app 0.1.1
iteminfo-mini-app 0.1.1
b2fe2595fc04d6f364e156a85ee325c05dbf3c02
--- package-lock.json @@ -4343,9 +4343,9 @@ "integrity": "sha512-qJaaKPSs5rNbukmidrZoqqWylzPX1nos0NwavGpgMjfCIvRuAE83yxNgNMV2KNP8y42YfNhEQlMJ5dCnsg/vWw==" }, "@walmart/push-to-talk-mini-app": { - "version": "0.5.98", - "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.5.98.tgz", - "integrity": "sha512-P1/OGL+95XKEU0ZiFsN+UlC6HmfJPMS0SWVQCWadzi16+1uLfL5IFpy86zedWN8N8aSm19qThpaJgLkTY0l1mg==" + "version": "0.5.99", + "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.5.99.tgz", + "integrity": "sha512-lLdBvVheeXIg/tvz4a/mKimPBSJud2GOrVa5nvRUrv/JvKPSZiPum9Si+IGvsalPk93W/Go/yPCgtHJdR6MHoQ==" }, "@walmart/react-native-collapsible": { "version": "1.5.3", --- package.json @@ -91,7 +91,7 @@ "@walmart/moment-walmart": "1.0.4", "@walmart/payrollsolution_miniapp": "0.98.0", "@walmart/price-changes-mini-app": "1.0.6", - "@walmart/push-to-talk-mini-app": "0.5.98", + "@walmart/push-to-talk-mini-app": "0.5.99", "@walmart/react-native-env": "^0.2.0", "@walmart/react-native-logger": "^1.28.0", "@walmart/react-native-shared-navigation": "^0.4.0",
removing unread count
removing unread count
5760759aa284cd4d5c53616f3889265833f205a8
--- scripts/mini-app-scan/scan-walmart-packages.sh @@ -30,6 +30,7 @@ else done fi +violation_found=0 for package_name in "${packages_to_scan[@]}"; do package_dir="./node_modules/@walmart/$package_name" if [ ! -d "$package_dir" ]; then @@ -68,6 +69,7 @@ for package_name in "${packages_to_scan[@]}"; do echo " ❌ VIOLATIONS FOUND:" echo "$clean_output" | head -20 # Show first 20 lines echo "" + violation_found=1 elif echo "$eslint_output" | grep -q "Definition for rule.*was not found"; then echo " ⚠️ Rule definition errors only (ignored)" else @@ -82,4 +84,10 @@ for package_name in "${packages_to_scan[@]}"; do echo "" done -echo "Scan complete!" +if [ "$violation_found" -eq 1 ]; then + echo "Scan complete! Violations found." + exit 1 +else + echo "Scan complete! No violations found." + exit 0 +fi
fix: scan script did not error out after finding violations
fix: scan script did not error out after finding violations
ef1412a1cee56c8dc0823d160e6a001314071ff6
--- packages/allspark-foundation-hub/src/HubFeature/Hub/Container/Screens/HubDashboard.tsx @@ -382,8 +382,8 @@ export const HubDashboard = ({ </View> )} <HubHeader - title={headerDetails.title} - subText={headerDetails.subText} + title={headerDetails.title || t('hubheader.title')} + subText={headerDetails.subText || t('hubheader.subText')} /> <TeamSwitcher onTeamChange={(teamLabel, teamIds) =>
Update the header text
Update the header text
32c3f46adafa596d37e7d4b9cfb926beb3aca82c
--- packages/celebration-mini-app/package.json @@ -36,6 +36,7 @@ "@walmart/allspark-components-library": "1.1.0", "@walmart/allspark-foundation": "^6.32.0", "@walmart/allspark-foundation-hub": "1.13.0-beta.5047+b433a2a7", + "@walmart/associate-exp-hub-mini-app": "1.4.0-alpha.21", "@walmart/gtp-shared-components": "2.2.4", "@walmart/me-at-walmart-common": "6.29.0-alpha.0", "eslint": "^8.19.0", --- packages/celebration-mini-app/src/components/HubCelebrationWidget.tsx @@ -78,6 +78,7 @@ import {useCelebrations} from '../hooks'; import {translationClient} from '../utils/translation'; import {CelebrationLogger} from '../utils/logger'; import {CelebrationTelemetryHelpers} from '../utils/telemetry'; +import {ActivityAwareWidget} from '@walmart/associate-exp-hub-mini-app'; /** * WIDGET PROPS INTERFACE @@ -732,13 +733,23 @@ const styles = StyleSheet.create({ * - widgetStyle: styling configuration */ -// Wrap with providers +// Wrap with providers and ActivityAwareWidget export const HubCelebrationWidget: React.FC<HubCelebrationWidgetProps> = ( props -) => ( - <CelebrationErrorBoundary> - <CelebrationThemeProvider theme={defaultTheme}> - <HubCelebrationWidgetCore {...props} /> - </CelebrationThemeProvider> - </CelebrationErrorBoundary> -); +) => { + + return ( + <CelebrationErrorBoundary> + <CelebrationThemeProvider theme={defaultTheme}> + <ActivityAwareWidget + refresh={props.refresh ?? undefined} + teamData={props.teamData} + name="CelebrationWidget" + debug={__DEV__} + > + <HubCelebrationWidgetCore {...props} /> + </ActivityAwareWidget> + </CelebrationThemeProvider> + </CelebrationErrorBoundary> + ); +}; --- yarn.lock @@ -7389,6 +7389,21 @@ __metadata: languageName: node linkType: hard +"@walmart/associate-exp-hub-mini-app@npm:1.4.0-alpha.21": + version: 1.4.0-alpha.21 + resolution: "@walmart/associate-exp-hub-mini-app@npm:1.4.0-alpha.21::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fassociate-exp-hub-mini-app%2F-%2F%40walmart%2Fassociate-exp-hub-mini-app-1.4.0-alpha.21.tgz" + peerDependencies: + "@walmart/allspark-foundation": ">=6.32.0" + "@walmart/allspark-foundation-hub": 1.13.0-beta.5047+b433a2a7 + expo: 52.x + expo-image: "*" + react: "*" + react-native: "*" + react-native-safe-area-context: "*" + checksum: 10c0/6aa4641eadefdfe3dd4bac6833fdd8990c9082fd876695cc34e4ecd7b3f66d987a0c6f2dcdf7136505b84772c931aeb902289e5db56a3faacee807cb7d89f5e3 + languageName: node + linkType: hard + "@walmart/celebration-mini-app-container@workspace:container": version: 0.0.0-use.local resolution: "@walmart/celebration-mini-app-container@workspace:container" @@ -7593,6 +7608,7 @@ __metadata: "@walmart/allspark-components-library": "npm:1.1.0" "@walmart/allspark-foundation": "npm:^6.32.0" "@walmart/allspark-foundation-hub": "npm:1.13.0-beta.5047+b433a2a7" + "@walmart/associate-exp-hub-mini-app": "npm:1.4.0-alpha.21" "@walmart/gtp-shared-components": "npm:2.2.4" "@walmart/me-at-walmart-common": "npm:6.29.0-alpha.0" eslint: "npm:^8.19.0"
feat(ui): update widget wrapper
feat(ui): update widget wrapper
0a6cb677bf8a4a0261e292f3177893fa95e312bd
--- core/__tests__/settings/privacy/PrivacyPreferencesTest.tsx @@ -113,4 +113,25 @@ describe('PrivacyPreferences', () => { AllsparkReduxStore.select(UserSelectors.getUserAnniversaryPreference), ).toEqual(false); }); + it('renders correctly when value changes', async () => { + mockUseTranslation.mockReturnValueOnce({t, i18n: {language: 'es-US'}}); + mockUseSelector.mockReturnValueOnce('123451234'); // win + mockUseSelector.mockReturnValueOnce(false); // birthday pref + mockUseSelector.mockReturnValueOnce(true); // anniversary pref + mockUseState.mockReturnValue(['', setSelection]); //selection state; + mockMutation.mockReturnValue([mockUpsertMutation, {loading: true}]); + + const {toJSON, getByTestId} = render( + <PrivacyPreferences navigation={navigation} route={route} />, + ); + expect(toJSON()).toMatchSnapshot(); + await waitFor(() => getByTestId('birthday_setting').props.onToggle()); + mockUpsertMutation(); + expect(toJSON()).toMatchSnapshot(); + + //Anniversary + getByTestId('anniversary_setting').props.onToggle(); + mockUpsertMutation(); + expect(toJSON()).toMatchSnapshot(); + }); }); --- core/__tests__/settings/privacy/__snapshots__/PrivacyPreferencesTest.tsx.snap @@ -83,3 +83,255 @@ exports[`PrivacyPreferences renders 1`] = ` </View> </View> `; + +exports[`PrivacyPreferences renders correctly when value changes 1`] = ` +<View + style={ + { + "backgroundColor": "white", + "flex": 1, + "paddingHorizontal": 16, + } + } +> + <View + style={ + { + "paddingTop": 16, + } + } + > + <Heading> + privacyPreferences.title + </Heading> + <Body> + privacyPreferences.subTitle + </Body> + </View> + <ToggleSetting + descriptionOff="privacyPreferences.birthdayDesc" + descriptionOn="privacyPreferences.birthdayDesc" + error={false} + errorMessage="privacyPreferences.error" + icon={ + <Icon + name="birthdayCakePreference" + /> + } + labelOff="privacyPreferences.birthdayLabel" + labelOn="privacyPreferences.birthdayLabel" + loading={false} + onToggle={[Function]} + testID="birthday_setting" + value={false} + /> + <View + style={ + { + "backgroundColor": "#e3e4e5", + "flexDirection": "row", + "height": 1, + "marginTop": 24, + } + } + /> + <ToggleSetting + descriptionOff="privacyPreferences.anniversaryDesc" + descriptionOn="privacyPreferences.anniversaryDesc" + error={false} + errorMessage="privacyPreferences.error" + icon={ + <Icon + name="anniversaryPrivacy" + /> + } + labelOff="privacyPreferences.anniversaryLabel" + labelOn="privacyPreferences.anniversaryLabel" + loading={false} + onToggle={[Function]} + testID="anniversary_setting" + value={true} + /> + <View + style={ + { + "flex": 1, + "justifyContent": "flex-end", + "paddingBottom": 16, + } + } + > + <Body> + privacyPreferences.footerTitle + </Body> + </View> +</View> +`; + +exports[`PrivacyPreferences renders correctly when value changes 2`] = ` +<View + style={ + { + "backgroundColor": "white", + "flex": 1, + "paddingHorizontal": 16, + } + } +> + <View + style={ + { + "paddingTop": 16, + } + } + > + <Heading> + privacyPreferences.title + </Heading> + <Body> + privacyPreferences.subTitle + </Body> + </View> + <ToggleSetting + descriptionOff="privacyPreferences.birthdayDesc" + descriptionOn="privacyPreferences.birthdayDesc" + error={false} + errorMessage="privacyPreferences.error" + icon={ + <Icon + name="birthdayCakePreference" + /> + } + labelOff="privacyPreferences.birthdayLabel" + labelOn="privacyPreferences.birthdayLabel" + loading={false} + onToggle={[Function]} + testID="birthday_setting" + value={false} + /> + <View + style={ + { + "backgroundColor": "#e3e4e5", + "flexDirection": "row", + "height": 1, + "marginTop": 24, + } + } + /> + <ToggleSetting + descriptionOff="privacyPreferences.anniversaryDesc" + descriptionOn="privacyPreferences.anniversaryDesc" + error={false} + errorMessage="privacyPreferences.error" + icon={ + <Icon + name="anniversaryPrivacy" + /> + } + labelOff="privacyPreferences.anniversaryLabel" + labelOn="privacyPreferences.anniversaryLabel" + loading={false} + onToggle={[Function]} + testID="anniversary_setting" + value={true} + /> + <View + style={ + { + "flex": 1, + "justifyContent": "flex-end", + "paddingBottom": 16, + } + } + > + <Body> + privacyPreferences.footerTitle + </Body> + </View> +</View> +`; + +exports[`PrivacyPreferences renders correctly when value changes 3`] = ` +<View + style={ + { + "backgroundColor": "white", + "flex": 1, + "paddingHorizontal": 16, + } + } +> + <View + style={ + { + "paddingTop": 16, + } + } + > + <Heading> + privacyPreferences.title + </Heading> + <Body> + privacyPreferences.subTitle + </Body> + </View> + <ToggleSetting + descriptionOff="privacyPreferences.birthdayDesc" + descriptionOn="privacyPreferences.birthdayDesc" + error={false} + errorMessage="privacyPreferences.error" + icon={ + <Icon + name="birthdayCakePreference" + /> + } + labelOff="privacyPreferences.birthdayLabel" + labelOn="privacyPreferences.birthdayLabel" + loading={false} + onToggle={[Function]} + testID="birthday_setting" + value={false} + /> + <View + style={ + { + "backgroundColor": "#e3e4e5", + "flexDirection": "row", + "height": 1, + "marginTop": 24, + } + } + /> + <ToggleSetting + descriptionOff="privacyPreferences.anniversaryDesc" + descriptionOn="privacyPreferences.anniversaryDesc" + error={false} + errorMessage="privacyPreferences.error" + icon={ + <Icon + name="anniversaryPrivacy" + /> + } + labelOff="privacyPreferences.anniversaryLabel" + labelOn="privacyPreferences.anniversaryLabel" + loading={false} + onToggle={[Function]} + testID="anniversary_setting" + value={true} + /> + <View + style={ + { + "flex": 1, + "justifyContent": "flex-end", + "paddingBottom": 16, + } + } + > + <Body> + privacyPreferences.footerTitle + </Body> + </View> +</View> +`;
bump coverage
bump coverage
2dd8a3d431f27f3726da224f3742f950e5784509
--- packages/allspark-foundation-hub/__tests__/HubFeature/supplyChain/ShiftFilter.test.tsx @@ -60,4 +60,10 @@ describe('ShiftFilter', () => { const teamImage = getByTestId('teamImage-shiftFilter'); expect(teamImage.props.source.uri).toBe('http://example.com/image.jpg'); }); + + it('Test 4: Renders shiftId correctly', () => { + const { getByTestId } = render(<ShiftFilter {...mockShiftFilterProps} />); + const shiftId = getByTestId('shiftId'); + expect(shiftId.props.children).toBe('shift123'); + }); });
Adding Test 4 for shiftFilter
Adding Test 4 for shiftFilter
a27a0e84c816323edd8d52d7b18a2276ef472dfd
--- .sentinelpolicy @@ -0,0 +1,5 @@ +suppressionkey=93cf0019f;This is a test file +suppressionkey=4a049898c;This is a test file +suppressionkey=38daf1f0a;This is a test file +suppressionkey=d297e644d;This is a test file +suppressionkey=244649258;This is a test file
chore: add sentinel policy config for false positive code scans
chore: add sentinel policy config for false positive code scans
9291e4f9ab987e6bb1f8a0106a75763e3e6404fa
--- package-lock.json @@ -43,7 +43,7 @@ "@walmart/attendance-mini-app": "1.62.13", "@walmart/compass-sdk-rn": "5.18.9", "@walmart/config-components": "4.2.13", - "@walmart/copilot-mini-app": "3.32.1", + "@walmart/copilot-mini-app": "3.33.6", "@walmart/core-services": "~2.3.0", "@walmart/core-services-allspark": "~2.13.4", "@walmart/core-utils": "~2.0.5", @@ -8592,9 +8592,9 @@ } }, "node_modules/@walmart/copilot-mini-app": { - "version": "3.32.1", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.32.1.tgz", - "integrity": "sha512-yi7w1G7APqCcQPUF0mHjKTal4s++1SPJaM2j2YoqzKZG2gyQv7tqQV7kEJ1IVkjE3dldLv24wbw6IdUhQ/quwQ==", + "version": "3.33.6", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.33.6.tgz", + "integrity": "sha512-FHcHLEvS0KDI6KdoABGqKPbh4I49/j2ZV3BSX6RADoWWCIFpbVJxbLUXf6YE42q/tF7kWtZJbC7Z2bsFbgSDrw==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -33223,9 +33223,9 @@ } }, "@walmart/copilot-mini-app": { - "version": "3.32.1", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.32.1.tgz", - "integrity": "sha512-yi7w1G7APqCcQPUF0mHjKTal4s++1SPJaM2j2YoqzKZG2gyQv7tqQV7kEJ1IVkjE3dldLv24wbw6IdUhQ/quwQ==" + "version": "3.33.6", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.33.6.tgz", + "integrity": "sha512-FHcHLEvS0KDI6KdoABGqKPbh4I49/j2ZV3BSX6RADoWWCIFpbVJxbLUXf6YE42q/tF7kWtZJbC7Z2bsFbgSDrw==" }, "@walmart/core-services": { "version": "2.3.2", --- package.json @@ -84,7 +84,7 @@ "@walmart/attendance-mini-app": "1.62.13", "@walmart/compass-sdk-rn": "5.18.9", "@walmart/config-components": "4.2.13", - "@walmart/copilot-mini-app": "3.32.1", + "@walmart/copilot-mini-app": "3.33.6", "@walmart/core-services": "~2.3.0", "@walmart/core-services-allspark": "~2.13.4", "@walmart/core-utils": "~2.0.5",
chore: bump copilot@3.33.6
chore: bump copilot@3.33.6
17792e9c62dd9602cb940a2fee67ff49386a40e4
--- src/components/ClockStatusIndicator.tsx @@ -1,8 +1,7 @@ import React from 'react'; import {StyleProp, StyleSheet, TextStyle, View, ViewStyle} from 'react-native'; import {Body, colors} from '@walmart/gtp-shared-components'; -import {useTranslation} from 'react-i18next'; -import {MY_TEAM_I18N_NAMESPACE} from '../translations'; +import {translationClient} from '../common/translation'; const styles = StyleSheet.create({ indicatorRow: { @@ -43,7 +42,7 @@ export const ClockStatusIndicator = ({ style, textStyle, }: PresenceIndicatorProps) => { - const {t} = useTranslation([MY_TEAM_I18N_NAMESPACE]); + const {t} = translationClient.useTranslation(); return ( <View style={[styles.indicatorRow, style]}> {showIndicator && ( --- src/components/ClockedOutScreenGuard.tsx @@ -6,12 +6,11 @@ import React, {ReactElement} from 'react'; import {StyleSheet} from 'react-native'; import {Alert} from '@walmart/gtp-shared-components'; import {useSelector} from 'react-redux'; -import {useTranslation} from 'react-i18next'; import {UserHeader} from '../containers/UserHeader'; import {createStackNavigator} from '@react-navigation/stack'; import {TextingNavParamsMap} from '../navigation'; import {DrawerButton, Header} from '@walmart/ui-components'; -import {MY_TEAM_I18N_NAMESPACE} from '../translations'; +import {translationClient} from '../common/translation'; import {AllsparkNavigationClient} from '@walmart/allspark-foundation/Navigation'; import {showViewTimeClock} from '../redux/selectors'; import {useIsHourly, useUserIsInRoster} from '../hooks/user'; @@ -30,7 +29,7 @@ interface ClockedOutScreenGuardProps { const ClockedOutStack = createStackNavigator<TextingNavParamsMap>(); export const ClockedOutScreen = () => { - const {t} = useTranslation([MY_TEAM_I18N_NAMESPACE]); + const {t} = translationClient.useTranslation(); const shouldShowViewTimeClock: boolean = useSelector(showViewTimeClock); const isHourly = useIsHourly(); const userIsInRoster = useUserIsInRoster(); --- src/components/TeamHubHeader.tsx @@ -1,10 +1,9 @@ import React from 'react'; -import {useTranslation} from 'react-i18next'; -import {MY_TEAM_I18N_NAMESPACE} from '../translations'; import {HubHeader} from '@walmart/allspark-foundation-hub/HubFeature'; +import {translationClient} from '../common/translation'; export const TeamHubHeader = () => { - const {t} = useTranslation([MY_TEAM_I18N_NAMESPACE]); + const {t} = translationClient.useTranslation(); return ( <HubHeader title={t('hubHeader.title')} subText={t('hubHeader.subText')} /> ); --- src/containers/UserHeader.tsx @@ -5,10 +5,9 @@ import {Body, colors, ListItem} from '@walmart/gtp-shared-components'; import {Avatar} from '../components'; import {displayClockStatus, getEncryptedUserId} from '../redux/selectors'; -import {useTranslation} from 'react-i18next'; -import {MY_TEAM_I18N_NAMESPACE} from '../translations'; import {UserSelectors} from '@walmart/allspark-foundation/User'; import {ClockSelectors} from '@walmart/allspark-foundation/Clock'; +import {translationClient} from '../common/translation'; const styles = StyleSheet.create({ item: { @@ -33,7 +32,7 @@ export const UserHeader: React.FC<UserHeaderProps> = ({rightPanel = <></>}) => { const userId: string = useSelector(getEncryptedUserId); const name: string = useSelector(UserSelectors.getName) ?? ''; const isClockedIn = useSelector(ClockSelectors.getIsClockedIn) ?? false; - const {t} = useTranslation([MY_TEAM_I18N_NAMESPACE]); + const {t} = translationClient.useTranslation(); const showClockStatus = useSelector(displayClockStatus); return ( --- src/screens/TabsScreen.tsx @@ -4,8 +4,6 @@ import {StackNavigationProp} from '@react-navigation/stack'; import {LivingDesignTabBar} from '../navigation/components'; import {TextingNavParamsMap} from '../navigation/types'; import {UserHeader} from '../containers/UserHeader'; -import {useTranslation} from 'react-i18next'; -import {MY_TEAM_I18N_NAMESPACE} from '../translations'; import {WarningBanner} from '../containers/WarningBanner'; import { WmConnect, @@ -16,6 +14,7 @@ import { import {RosterScreen} from '@walmart/roster-mini-app'; import {useSelector} from 'react-redux'; import {displayDND} from '../redux/selectors'; +import {translationClient} from '../common/translation'; type TabsScreenProps = { navigation: StackNavigationProp<TextingNavParamsMap, 'myTeam.tabs'>; @@ -24,7 +23,7 @@ type TabsScreenProps = { const MainTab = createMaterialTopTabNavigator(); export const TabsScreen: React.FC<TabsScreenProps> = () => { - const {t} = useTranslation([MY_TEAM_I18N_NAMESPACE]); + const {t} = translationClient.useTranslation(); const showDNDSwitch = useSelector(displayDND); const renderDNDSwitch = () => (
Update my team migration changes
Update my team migration changes
d0e83a9615391c76e50f5e60b08886facce00b63
--- package-lock.json @@ -42336,12 +42336,8 @@ "react-native-drop-shadow": { "version": "1.0.0", "resolved": "https://npme.walmart.com/react-native-drop-shadow/-/react-native-drop-shadow-1.0.0.tgz", -<<<<<<< HEAD - "integrity": "sha512-om6oMDDn90ClFa+tEGMsFcACKlea5TO4jYur8PJKRpzfz+SnDIJlddhzp2kbOLpRTe7lleq6Md5QqC3u7RfOow==" -======= "integrity": "sha512-om6oMDDn90ClFa+tEGMsFcACKlea5TO4jYur8PJKRpzfz+SnDIJlddhzp2kbOLpRTe7lleq6Md5QqC3u7RfOow==", "dev": true ->>>>>>> 4350c56f3e3d1fb00d7ae7d60d454bc7d415926c }, "react-native-elements": { "version": "3.4.2",
Restore package json
Restore package json
beb155777c3c7533b4ca62b0a5cfe152dce6cb8d
--- package.json @@ -141,7 +141,7 @@ "@types/seamless-immutable": "^7.1.16", "@types/semver": "^7.3.4", "@types/uuid": "^8.3.0", - "@walmart/allspark-foundation": "6.20.2", + "@walmart/allspark-foundation": "6.21.3", "@walmart/allspark-graphql-client": "~6.3.28", "@walmart/allspark-http-client": "~6.3.28", "@walmart/allspark-utils": "~6.5.0", --- targets/US/package.json @@ -77,7 +77,7 @@ "@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": "~6.4.1", "@walmart/allspark-cope-key-listener": "0.0.18", - "@walmart/allspark-foundation": "6.21.2", + "@walmart/allspark-foundation": "6.21.3", "@walmart/allspark-graphql-client": "~6.3.28", "@walmart/allspark-http-client": "~6.3.28", "@walmart/allspark-neon-core": "0.1.31", --- yarn.lock @@ -5679,9 +5679,9 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-foundation@npm:6.20.2": - version: 6.20.2 - resolution: "@walmart/allspark-foundation@npm:6.20.2" +"@walmart/allspark-foundation@npm:6.21.3": + version: 6.21.3 + resolution: "@walmart/allspark-foundation@npm:6.21.3" dependencies: "@apollo/client": "npm:^3.8.6" "@graphql-codegen/cli": "npm:^5.0.0" @@ -5691,7 +5691,7 @@ __metadata: "@graphql-codegen/typescript-react-apollo": "npm:^4.1.0" "@reduxjs/toolkit": "npm:^1.9.7" "@types/node-fetch": "npm:^2.6.9" - "@walmart/allspark-utils": "npm:^6.5.0" + "@walmart/allspark-utils": "npm:^6.5.1" axios: "npm:~1.6.0" axios-cache-interceptor: "npm:^1.3.2" crypto-js: "npm:~4.2.0" @@ -5774,7 +5774,7 @@ __metadata: allspark-generate-graphql: cli/generate.js allspark-link: cli/link.js allspark-setup: cli/setup.js - checksum: 10c0/411380b8b8a9b606e552d3db2c60cc402a0f98e51adf9cc2079ef5a8031c662358c03d3c72e6718ad6a514ed99184aa7109383d74fc9bcd40fdd5f6a49c5be75 + checksum: 10c0/571214d7ebac7781784ee3ae042b5a36ec197f3f7bd8a059d34bd27b97ab69ceb99c794a07bb7c7e79cb138fc4f1c2cd186f3662995ae0efa75edbeb58cb1d0a languageName: node linkType: hard @@ -6993,7 +6993,7 @@ __metadata: "@types/uuid": "npm:^8.3.0" "@walmart/allspark-authentication": "npm:~6.4.1" "@walmart/allspark-cope-key-listener": "npm:0.0.18" - "@walmart/allspark-foundation": "npm:6.21.2" + "@walmart/allspark-foundation": "npm:6.21.3" "@walmart/allspark-graphql-client": "npm:~6.3.28" "@walmart/allspark-http-client": "npm:~6.3.28" "@walmart/allspark-neon-core": "npm:0.1.31"
fix: upgrade foundation for dynamic component fix
fix: upgrade foundation for dynamic component fix
246822100a97499c6e9f5ecbf11b214546b20968
--- package-lock.json @@ -4951,9 +4951,9 @@ "integrity": "sha512-kXnxC7X1ly3Mwl0m18cFiJ91Ybcnw34BcB5F8wF6xbXZrHXdpsaFBqLrnruDwBO/2vvPonYe/Y8otpuIWUXlvQ==" }, "@walmart/taskit-mini-app": { - "version": "0.31.0", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.31.0.tgz", - "integrity": "sha512-DaPer/lSr182SR1GwSrdbXsKkOjdO1WxYpqeKPPo9H4DlFcEI9L5OpAbowZr2/BNn8SZIIAGsV7yyUXDqiHBBA==" + "version": "0.32.0", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.32.0.tgz", + "integrity": "sha512-usmI56rCuMnGXw4M4cxP4BdpIiXVq3xWO/OyZeM2hl+qJ4YjQ+g96P3GF2rgMxWFfAHb/gvmWz6lfo/jN2hPwQ==" }, "@walmart/time-clock-mini-app": { "version": "0.5.3", --- package.json @@ -104,7 +104,7 @@ "@walmart/schedule-mini-app": "0.13.0", "@walmart/settings-mini-app": "1.6.0", "@walmart/shelfavailability-mini-app": "1.0.0", - "@walmart/taskit-mini-app": "0.31.0", + "@walmart/taskit-mini-app": "0.32.0", "@walmart/time-clock-mini-app": "0.5.3", "@walmart/ui-components": "1.4.0-rc.0", "@walmart/welcomeme-mini-app": "0.69.0",
Updating taskIt version
Updating taskIt version
538004af6bf4f9ed1bef773624fd85b0769344c4
--- package.json @@ -106,7 +106,7 @@ "@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.30", "@walmart/gta-react-native-calendars": "0.7.0", "@walmart/gtp-shared-components": "2.2.7", "@walmart/ims-print-services-ui": "2.21.1", --- src/core/translations.ts @@ -19,6 +19,7 @@ export const enUS = { '@walmart/facilities-management-miniapp': 'Facility management', '@walmart/feedback-all-spark-miniapp': 'Feedback', '@walmart/financial-wellbeing-feature-app': 'Financial Wellbeing', + '@walmart/global-vpi-mini-app': 'Global VPI', '@walmart/gtp-shared-components': 'GTP components', '@walmart/ims-print-services-ui': 'Print', '@walmart/inbox-mini-app': 'Inbox', @@ -256,6 +257,7 @@ export const esMX = { '@walmart/facilities-management-miniapp': 'Gestión de instalaciones', '@walmart/feedback-all-spark-miniapp': 'Feedback', '@walmart/financial-wellbeing-feature-app': 'Financial Wellbeing', + '@walmart/global-vpi-mini-app': 'Global VPI', '@walmart/gtp-shared-components': 'GTP componentes', '@walmart/ims-print-services-ui': 'Imprimir', '@walmart/inbox-mini-app': 'Inbox', --- src/versions.ts @@ -25,6 +25,7 @@ export const LISTED_DEPENDENCIES = [ '@walmart/facilities-management-miniapp', '@walmart/feedback-all-spark-miniapp', '@walmart/financial-wellbeing-feature-app', + '@walmart/global-vpi-mini-app', '@walmart/gtp-shared-components', '@walmart/ims-print-services-ui', '@walmart/inbox-mini-app', --- yarn.lock @@ -7159,10 +7159,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.30": + version: 1.1.30 + resolution: "@walmart/global-vpi-mini-app@npm:1.1.30::__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.30.tgz" + checksum: 10c0/7d7479895ec9f1cae256af551ede8fe6a968d521744ca344c90ce7844661fc34bcd37d56af9f505d288bf25687cfe7504eb0d0ac090f3ca54e34ee7784f66631 languageName: node linkType: hard @@ -7614,7 +7614,7 @@ __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.30" "@walmart/gta-react-native-calendars": "npm:0.7.0" "@walmart/gtp-shared-components": "npm:2.2.7" "@walmart/ims-print-services-ui": "npm:2.21.1"
chore: vpi version update (#4487)
chore: vpi version update (#4487) * feat: upgrade version global vpi 1.1.27 * chore: add app name and package name for global vpi * feat: upgrade version global vpi and add version global vpi app --------- Co-authored-by: Omar Flores <irving.omar.flores@walmart.com>
82027bba00148c2e0aa010f50eadb0a3b81aac13
--- packages/allspark-foundation-hub/src/SupplyChain/Hub/SiteHubDashboard.tsx @@ -342,7 +342,7 @@ export const SiteHubDashboard = ({ name, widgets }: HubDashboardProps) => { /> {show && showPopover && ( <Popover - content={"Tap here to change the team you're viewing."} + content={t('dashboard.callout.title')} handleClose={handlePopoverClose} showPopover={show} UNSAFE_style={{ width: '60%' }} --- packages/allspark-foundation-hub/src/SupplyChain/Modals/EditSavedTeamModal/EditSavedTeamSection.tsx @@ -20,11 +20,16 @@ export const EditSavedTeamSection: React.FC<EditSavedTeamSectionProps> = ({ handleSearchInput, headerTitle, subTitle, + loading = false, fromOnboarding = false, }) => { const { t } = useAllsparkTranslation(FEATURE_ID); const showAllTeamsList = useSelector(allTeamsListEnabled); + if (loading) { + return <EditSavedTeamsSectionLoading />; + } + return ( <> <View style={styles.rootContainer}> @@ -64,7 +69,6 @@ export const EditSavedTeamSection: React.FC<EditSavedTeamSectionProps> = ({ toggleSelection={() => handleSelection(item.teamId)} /> )} - ListEmptyComponent={<EditSavedTeamsSectionLoading />} ListFooterComponent={<View style={styles.footerContainer} />} /> )} --- packages/allspark-foundation-hub/src/SupplyChain/Modals/EditSavedTeamModal/types.ts @@ -37,6 +37,7 @@ export interface AllTeamsSections { export interface EditSavedTeamSectionProps { sections: Array<AllTeamsSections>; selectedTeams: string[]; + loading?: boolean; handleSelection: (name: string) => void; handleSearchInput: (input: string) => void; headerTitle?: string; --- packages/allspark-foundation-hub/src/SupplyChain/Screens/OnboardingScreen/OnboardingScreen.tsx @@ -43,6 +43,7 @@ export const OnboardingScreen = () => { allSiteTeamsSections, error: teamsError, refetch: refetchTeams, + loading: allTeamsLoading, } = useGetSupplyChainAllTeamsBySite(); const { allShifts, @@ -245,6 +246,7 @@ export const OnboardingScreen = () => { handleSearchInput={handleSearchInput} headerTitle={t('dashboard.listSection.title')} subTitle={t('dashboard.listSection.subTitle')} + loading={allTeamsLoading} fromOnboarding /> </View> --- packages/allspark-foundation-hub/src/SupplyChain/translation.ts @@ -63,6 +63,9 @@ export const enUS = { subTitle: 'Star teams you’re interested in, then save. If none are selected, you’ll see data for your entire site.', }, + callout: { + title: "Tap here to change the team you're viewing.", + }, buttonTitle: 'Save and go to my hub', skipLink: 'Skip for now and go to my hub', }, @@ -171,6 +174,9 @@ export const esMX: typeof enUS = { subTitle: 'Marca los equipos que te interesen y guarda. Si no se selecciona ninguno, verás los datos de todo el sitio.', }, + callout: { + title: 'Pulsa aquí para cambiar el equipo que estás viendo.', + }, buttonTitle: 'Guardar e ir a mi centro', skipLink: 'Skip for now and go to my hub', },
feat(ui): updated loader logic for teams on search
feat(ui): updated loader logic for teams on search
08bc24ee7d6d1d385508e82e69f3ce407bccb7d3
--- src/channels/provider.tsx @@ -19,14 +19,19 @@ import { createTeamChannelPath, } from './utils'; import { + ChannelDocumentSnapshot, ChannelQuerySnapshot, ChannelsState, DelayedCountCalc, DelayedNameCalc, + FirebaseChannel, } from './types'; import {ChannelsContext} from './context'; import {DEFAULT_CHANNELS_STATE} from './constants'; -import {normalizeChannelSnapshot} from './transforms'; +import { + normalizeChannelDocumentSnapshot, + normalizeChannelSnapshot, +} from './transforms'; import {fetchChannelName, fetchChannelLastMessage} from './services'; import {logger} from '../logger/Logger'; import {textingSlice} from '../redux/reducer'; @@ -68,21 +73,57 @@ export const ChannelsProvider = (props: PropsWithChildren<{}>) => { const storeDocumentPath = createStoreChannelPath(siteId); firestore() - .doc(storeDocumentPath) + .doc<FirebaseChannel>(storeDocumentPath) .get() .then((storeChannelDoc) => { //TODO: Set the channelsState for store if not exists - console.log('The Store Channel Doc'); - console.log(storeChannelDoc); + if (!channelState.ids.includes(storeDocumentPath)) { + const normalizedStoreChannelDocument = + normalizeChannelDocumentSnapshot( + storeChannelDoc as ChannelDocumentSnapshot, + storeDocumentPath, + viewerId, + ); + setChannelState((previous) => ({ + ...previous, + ids: [...previous.ids, ...normalizedStoreChannelDocument.ids], + dataById: { + ...previous.dataById, + ...normalizedStoreChannelDocument.dataById, + }, + documentById: { + ...previous.documentById, + ...normalizedStoreChannelDocument.documentById, + }, + })); + } }); firestore() .doc(teamDocumentPath) .get() .then((teamChannelDoc) => { - //TODO: Set the channelsState for team if not exists - console.log('The Team Channel Doc'); - console.log(teamChannelDoc); + if (!channelState.ids.includes(teamDocumentPath)) { + //TODO: Create method for this update, same logic as store update + const normalizedTeamChannelDocument = + normalizeChannelDocumentSnapshot( + teamChannelDoc as ChannelDocumentSnapshot, + teamDocumentPath, + viewerId, + ); + setChannelState((previous) => ({ + ...previous, + ids: [...previous.ids, ...normalizedTeamChannelDocument.ids], + dataById: { + ...previous.dataById, + ...normalizedTeamChannelDocument.dataById, + }, + documentById: { + ...previous.documentById, + ...normalizedTeamChannelDocument.documentById, + }, + })); + } }); subscriptionOff(); --- src/channels/transforms.ts @@ -7,8 +7,32 @@ import { ChannelQuerySnapshot, ChannelsState, LastMessage, + ChannelDocumentSnapshot, } from './types'; +export const normalizeChannelDocumentSnapshot = ( + channelDocument: ChannelDocumentSnapshot, + documentPath: string, + viewerId: string, +) => { + const documentData = channelDocument.data(); + return { + ids: [documentPath], + dataById: { + [documentPath]: { + ...documentData, + id: documentPath, + recipients: documentData.participants.filter( + (participantId: string) => participantId !== viewerId, + ), + }, + }, + documentById: { + [documentPath]: channelDocument.ref, + }, + }; +}; + export const normalizeChannelSnapshot = ( snapshot: ChannelQuerySnapshot, viewerId: string, --- src/channels/provider.tsx @@ -19,14 +19,19 @@ import { createTeamChannelPath, } from './utils'; import { + ChannelDocumentSnapshot, ChannelQuerySnapshot, ChannelsState, DelayedCountCalc, DelayedNameCalc, + FirebaseChannel, } from './types'; import {ChannelsContext} from './context'; import {DEFAULT_CHANNELS_STATE} from './constants'; -import {normalizeChannelSnapshot} from './transforms'; +import { + normalizeChannelDocumentSnapshot, + normalizeChannelSnapshot, +} from './transforms'; import {fetchChannelName, fetchChannelLastMessage} from './services'; import {logger} from '../logger/Logger'; import {textingSlice} from '../redux/reducer'; @@ -68,21 +73,57 @@ export const ChannelsProvider = (props: PropsWithChildren<{}>) => { const storeDocumentPath = createStoreChannelPath(siteId); firestore() - .doc(storeDocumentPath) + .doc<FirebaseChannel>(storeDocumentPath) .get() .then((storeChannelDoc) => { //TODO: Set the channelsState for store if not exists - console.log('The Store Channel Doc'); - console.log(storeChannelDoc); + if (!channelState.ids.includes(storeDocumentPath)) { + const normalizedStoreChannelDocument = + normalizeChannelDocumentSnapshot( + storeChannelDoc as ChannelDocumentSnapshot, + storeDocumentPath, + viewerId, + ); + setChannelState((previous) => ({ + ...previous, + ids: [...previous.ids, ...normalizedStoreChannelDocument.ids], + dataById: { + ...previous.dataById, + ...normalizedStoreChannelDocument.dataById, + }, + documentById: { + ...previous.documentById, + ...normalizedStoreChannelDocument.documentById, + }, + })); + } }); firestore() .doc(teamDocumentPath) .get() .then((teamChannelDoc) => { - //TODO: Set the channelsState for team if not exists - console.log('The Team Channel Doc'); - console.log(teamChannelDoc); + if (!channelState.ids.includes(teamDocumentPath)) { + //TODO: Create method for this update, same logic as store update + const normalizedTeamChannelDocument = + normalizeChannelDocumentSnapshot( + teamChannelDoc as ChannelDocumentSnapshot, + teamDocumentPath, + viewerId, + ); + setChannelState((previous) => ({ + ...previous, + ids: [...previous.ids, ...normalizedTeamChannelDocument.ids], + dataById: { + ...previous.dataById, + ...normalizedTeamChannelDocument.dataById, + }, + documentById: { + ...previous.documentById, + ...normalizedTeamChannelDocument.documentById, + }, + })); + } }); subscriptionOff(); --- src/channels/transforms.ts @@ -7,8 +7,32 @@ import { ChannelQuerySnapshot, ChannelsState, LastMessage, + ChannelDocumentSnapshot, } from './types'; +export const normalizeChannelDocumentSnapshot = ( + channelDocument: ChannelDocumentSnapshot, + documentPath: string, + viewerId: string, +) => { + const documentData = channelDocument.data(); + return { + ids: [documentPath], + dataById: { + [documentPath]: { + ...documentData, + id: documentPath, + recipients: documentData.participants.filter( + (participantId: string) => participantId !== viewerId, + ), + }, + }, + documentById: { + [documentPath]: channelDocument.ref, + }, + }; +}; + export const normalizeChannelSnapshot = ( snapshot: ChannelQuerySnapshot, viewerId: string,
setting the team and store channel state if not exists on initialization
setting the team and store channel state if not exists on initialization
7b58a8e8d946ca0ab89082df1447462b44570569
--- package-lock.json @@ -1856,9 +1856,9 @@ } }, "@walmart/allspark-home-mini-app": { - "version": "0.0.11", - "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.0.11.tgz", - "integrity": "sha512-7oN6pu4UfeW0wdeOG417Zrjt+HHPhFS6KmDej23oVSZSf00j0+yufOAxXRsd7z5zmBd+E21kcM4LU8ikK2p7rQ==", + "version": "0.1.0", + "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.1.0.tgz", + "integrity": "sha512-OPr3gJ9fi5n0WaAfuAig8d2QQJdmdamZ87MDcPEE0WAQPg9N6fux44CU0wrwG0K0cDKA1uviregGd4YlSXchEQ==", "requires": { "moment": "^2.29.0", "react-native-get-random-values": "^1.5.0", @@ -1887,9 +1887,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "0.6.4", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.6.4.tgz", - "integrity": "sha512-mA9PXtjpCe6eZRCrDzVi4X7BGYSddprZTUYDYPM9D3mSGVcMpqIcIICoZgS8umptHDsQ30LydDkFLjnMCYiyHw==", + "version": "0.6.6", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.6.6.tgz", + "integrity": "sha512-V4szxf7LoTf8GeL4jfZUVPEOhV3v2fNg+mFNUEqb+Yqqfdh/ZWMAfpQsvOUtmzbm8OeshjAKnb2PZLLGTwnzFA==", "requires": { "@babel/preset-typescript": "^7.10.4", "apisauce": "^1.1.2", @@ -1937,9 +1937,9 @@ "integrity": "sha512-iTkDEL7GeYYS8laso4ECQ7DyHgBxnJh/uP5PJNQMHZyKb8niIwIwb19HFLuGBVRa9vZIjTz7mChSydbIn4KV0w==" }, "@walmart/push-to-talk-mini-app": { - "version": "0.0.17", - "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.0.17.tgz", - "integrity": "sha512-9H1O5RT+r1q4dnRCSFvJA11diz3qqCLRYVqc3r+sMMzjfQHIRsSKC4q1DlSlmRnfDJi/PSKN9MdJ7mAjAGkIyw==" + "version": "0.0.19", + "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.0.19.tgz", + "integrity": "sha512-4dX+FyOYmEDzbTGLUP+4HBpQJ48KAShFYNRLblhrpiVfhvNKWkWkuFLCnCjg1xFTB3z0cCvnZu7ccm+Yd3IxIQ==" }, "@walmart/react-native-logger": { "version": "1.14.0", --- package.json @@ -37,7 +37,7 @@ "@react-navigation/stack": "^5.9.0", "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@types/lodash": "^4.14.159", - "@walmart/allspark-home-mini-app": "0.0.11", + "@walmart/allspark-home-mini-app": "^0.1.0", "@walmart/allspark-me-mini-app": "0.0.3", "@walmart/ask-sam-mini-app": "^0.6.6", "@walmart/config-components": "^1.0.4", --- src/navigation/Navigation.tsx @@ -9,6 +9,7 @@ import {HomeMiniApp} from '@walmart/allspark-home-mini-app'; import {AskSamMiniApp} from '@walmart/ask-sam-mini-app'; import {MeMiniApp} from '@walmart/allspark-me-mini-app'; import {TimeClockScreen} from '@walmart/time-clock-mini-app'; +import {ScheduleMiniApp} from '@walmart/schedule-mini-app'; import { PushToTalkMiniApp, @@ -26,6 +27,7 @@ import {SideMenuContent} from './SideMenuContent'; import {bottomSheetTransitionOptions} from './BottomSheetTransition'; import styles from './NavigationStyle'; +import {StackHeaderOptions} from '@react-navigation/stack/lib/typescript/src/types'; // TODO - this is temporary and should be removed once all nav content is filled in const placeholderStyle: StyleProp<ViewStyle> = { @@ -107,6 +109,14 @@ const MainTabsNav = () => { ); }; +const commonHeaderProps = { + headerStyle: styles.primaryHeader, + headerTintColor: 'white', + headerTitleAlign: 'left' as const, + headerTitleContainerStyle: styles.headerTitleContainer, + headerTitleStyle: styles.headerTitle, +}; + const DrawerContent = createStackNavigator(); const DrawerContentNav = () => ( @@ -115,14 +125,10 @@ const DrawerContentNav = () => ( name='main' component={MainTabsNav} options={({navigation}) => ({ + ...commonHeaderProps, headerShown: true, // TODO - take title from current route? headerTitle: 'Me@Walmart', - headerStyle: styles.primaryHeader, - headerTintColor: 'white', - headerTitleAlign: 'left', - headerTitleContainerStyle: styles.headerTitleContainer, - headerTitleStyle: styles.headerTitle, headerLeft: () => ( <TouchableOpacity onPress={() => navigation.dispatch(DrawerActions.toggleDrawer())} @@ -148,6 +154,14 @@ const DrawerNav = () => ( const RootStack = createStackNavigator(); +const commonModalHeaderProps: StackHeaderOptions = { + ...commonHeaderProps, + headerBackTitleVisible: false, + headerLeftContainerStyle: { + paddingStart: 16, + }, +}; + const RootNav = () => ( <RootStack.Navigator mode='modal' headerMode='screen'> <RootStack.Screen @@ -175,7 +189,25 @@ const RootNav = () => ( component={JoinGroupScreen} options={JoinGroupNavProperties} /> - <RootStack.Screen name='timeClock' component={TimeClockScreen} /> + <RootStack.Screen + name='timeClock' + component={TimeClockScreen} + options={{ + ...commonModalHeaderProps, + headerStyle: { + ...styles.primaryHeader, + shadowOffset: {width: 0, height: 0}, + }, + }} + /> + <RootStack.Screen + name='scheduleScreen' + component={ScheduleMiniApp} + options={{ + ...commonModalHeaderProps, + headerTitle: 'Full schedule', + }} + /> </RootStack.Navigator> );
updating home app; adding time clock and scheduling screens to root modal
updating home app; adding time clock and scheduling screens to root modal
ceec27e51bb8ae80fd478dd49bb93a7328e45d6b
--- package.json @@ -132,7 +132,7 @@ "@types/seamless-immutable": "^7.1.16", "@types/semver": "^7.3.4", "@types/uuid": "^8.3.0", - "@walmart/allspark-foundation": "6.15.3", + "@walmart/allspark-foundation": "6.15.4", "@walmart/allspark-graphql-client": "~6.3.20", "@walmart/allspark-http-client": "~6.3.20", "@walmart/allspark-utils": "~6.5.0", --- packages/core-services-allspark/src/index.tsx @@ -35,10 +35,10 @@ export const AllsparkCoreServices = ( ) => { const {children, recipe} = props; // eslint-disable-next-line react-hooks/exhaustive-deps - const env = useMemo(() => transformLegacyEnv(recipe.env), []); + const environment = useMemo(() => transformLegacyEnv(recipe.env), []); useEffect(() => { - MeAtWalmartContainer.initialize(env.env, env); + MeAtWalmartContainer.initialize({environment}); // eslint-disable-next-line react-hooks/exhaustive-deps }, []); --- targets/US/env.beta.js @@ -1,4 +1,5 @@ -// Environment Overrides for Beta -export const ENV = 'beta'; +const env = 'beta'; -export const ENV_OVERRIDES = {}; +module.exports = { + env, +}; --- targets/US/env.dev.js @@ -1,7 +1,7 @@ -// Environment Overrides for Dev -export const ENV = 'dev'; +const env = 'dev'; -export const ENV_OVERRIDES = { +module.exports = { + env, // Comment in for Local Development on Shadow Gatway // graphql: { // url: 'https://athena-gateway.sstage.us.walmart.net', --- targets/US/env.prod.js @@ -1,4 +1,5 @@ -// Environment Overrides for Prod -export const ENV = 'prod'; +const env = 'prod'; -export const ENV_OVERRIDES = {}; +module.exports = { + env, +}; --- targets/US/env.teflon.js @@ -1,4 +1,5 @@ -// Environment Overrides for Teflon -export const ENV = 'teflon'; +const env = 'teflon'; -export const ENV_OVERRIDES = {}; +module.exports = { + env, +}; --- targets/US/package.json @@ -77,7 +77,7 @@ "@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": "~6.4.1", "@walmart/allspark-cope-key-listener": "0.0.17", - "@walmart/allspark-foundation": "6.15.3", + "@walmart/allspark-foundation": "6.15.4", "@walmart/allspark-graphql-client": "~6.3.20", "@walmart/allspark-http-client": "~6.3.20", "@walmart/allspark-neon-core": "0.1.31", --- targets/US/src/App.tsx @@ -7,19 +7,34 @@ import { setupCore, } from '@walmart/me-at-walmart-core'; import {MeAtWalmartContainer} from '@walmart/me-at-walmart-container'; +import {AllsparkReduxStore} from '@walmart/allspark-foundation/Redux'; + +import environment from '../env'; -import {ENV, ENV_OVERRIDES} from '../env'; import {withCodePush} from './codePush'; -import {setupVersions} from './versions'; +import { + getLibraryData, + legacyVersionsReducer, + CONTAINER_VERSION, +} from './versions'; /** * Create US App */ export const createApp = (): ComponentProvider => { // Initialize the container as early as possible to ensure environment setup - MeAtWalmartContainer.initialize(ENV, ENV_OVERRIDES); + MeAtWalmartContainer.initialize({ + environment, + version: CONTAINER_VERSION, + libraries: getLibraryData(), + }); + + // Legacy versions state still required by some mini apps. + // Has to be setup in target since versions are determined here. + AllsparkReduxStore.addReducer('versions', legacyVersionsReducer); - setupVersions(); + // Most setup should be done in core. Only that which is specific to the container or + // library version should be handled in the target. setupCore(); /** --- targets/US/src/versions.ts @@ -1,8 +1,8 @@ -import {ContainerActionCreators} from '@walmart/allspark-foundation/Container'; import {AllsparkEnvironment} from '@walmart/allspark-foundation/Environment'; -import {AllsparkReduxStore} from '@walmart/allspark-foundation/Redux'; import packageJson from '../package.json'; +export const CONTAINER_VERSION = packageJson.version; + export const ALL_DEPENDENCIES: { [key: string]: string; } = packageJson.dependencies; @@ -14,7 +14,6 @@ export const LISTED_DEPENDENCIES = [ '@walmart/associate-listening-mini-app', '@walmart/attendance-mini-app', '@walmart/avp-shared-library', - '@walmart/rn-receiving-mini-app', '@walmart/avp-feature-app', '@walmart/backroom-mini-app', '@walmart/calling-mini-app', @@ -40,18 +39,18 @@ export const LISTED_DEPENDENCIES = [ '@walmart/refrigeration-alarms-mini-app', '@walmart/returns-mini-app', '@walmart/rfid-scan-mini-app', + '@walmart/rn-receiving-mini-app', '@walmart/roster-mini-app', '@walmart/schedule-mini-app', '@walmart/shelfavailability-mini-app', '@walmart/sidekick-mini-app', + '@walmart/store-feature-orders', '@walmart/taskit-mini-app', '@walmart/time-clock-mini-app', '@walmart/topstock-mini-app', '@walmart/welcomeme-mini-app', '@walmart/wm-plus-mini-app', '@walmart/wmconnect-mini-app', - 'react-native-ssmp-sso-allspark', - '@walmart/store-feature-orders', ]; export const shouldBeListed = (name: string) => @@ -101,17 +100,3 @@ export const getVersionSectionList = () => { // @backwards-compatability - Version data added to AllsparkEnvironment export const legacyVersionsReducer = (state: any) => state || getVersionSectionList(); - -export const setupVersions = () => { - /** - * Set library information data, currently unique per target - * Legacy version reducer dependent on target versions - */ - AllsparkReduxStore.dispatch( - ContainerActionCreators.SET_VERSION(packageJson.version), - ); - AllsparkReduxStore.dispatch( - ContainerActionCreators.SET_LIBRARIES(getLibraryData()), - ); - AllsparkReduxStore.addReducer('versions', legacyVersionsReducer); -}; --- yarn.lock @@ -5403,9 +5403,9 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-foundation@npm:6.15.3": - version: 6.15.3 - resolution: "@walmart/allspark-foundation@npm:6.15.3" +"@walmart/allspark-foundation@npm:6.15.4": + version: 6.15.4 + resolution: "@walmart/allspark-foundation@npm:6.15.4" dependencies: "@apollo/client": "npm:^3.8.6" "@graphql-codegen/cli": "npm:^5.0.0" @@ -5496,7 +5496,7 @@ __metadata: allspark-generate-graphql: cli/generate.js allspark-link: cli/link.js allspark-setup: cli/setup.js - checksum: 10c0/a0eb90d6d092492193feee2a11f20048151a54fa0e72dcdd2daf650b765edff5698b125a17d31f664837214a5f73356283757e0135c75a0bd2a2d20ead85a75b + checksum: 10c0/418dbc5f415a24c0b93937c6a60138314ab56c86cea6da1e9599e57bc67a7723af37dede3570e62e242035124f23f614934066699e52f190ccc6e85ca9214022 languageName: node linkType: hard @@ -6803,7 +6803,7 @@ __metadata: "@types/uuid": "npm:^8.3.0" "@walmart/allspark-authentication": "npm:~6.4.1" "@walmart/allspark-cope-key-listener": "npm:0.0.17" - "@walmart/allspark-foundation": "npm:6.15.3" + "@walmart/allspark-foundation": "npm:6.15.4" "@walmart/allspark-graphql-client": "npm:~6.3.20" "@walmart/allspark-http-client": "npm:~6.3.20" "@walmart/allspark-neon-core": "npm:0.1.31"
refactor: bump foundation and update container initialization
refactor: bump foundation and update container initialization
1d6b0e0f6150daedb6fc284575e65cdd77900de3
--- packages/allspark-http-client/src/react/hoc.tsx @@ -0,0 +1,17 @@ +import React, { ComponentProps, ComponentType } from 'react'; +import { HttpClientConfig } from '../types'; +import { HttpClientCloneProvider } from './providers'; + +export const withHttpClientClone = + <C extends ComponentType<any>>( + config: HttpClientConfig, + id: string, + Component: C + ) => + (props: ComponentProps<C>) => { + return ( + <HttpClientCloneProvider config={config} id={id}> + <Component {...props} /> + </HttpClientCloneProvider> + ); + }; --- packages/allspark-http-client/src/react/index.ts @@ -1,3 +1,4 @@ export * from './context'; +export * from './hoc'; export * from './hooks'; export * from './providers';
feat: add clone provider hoc
feat: add clone provider hoc
12519a8fa3956ba9acc6d97f36281ee16633fb0d
--- .looper.multibranch.yml @@ -261,10 +261,10 @@ flows: pr: - npm install - npm run env:dev -# - npm run lint -# - npm run coverage -# - call: build-js-bundle -# - call: notify-pr-via-slack + - npm run lint + - npm run coverage + - call: build-js-bundle + - call: notify-pr-via-slack ## build entry point ## @@ -283,7 +283,7 @@ flows: - call: increment-version-code - node(label=$LOOPER_NODES, ws="exclusive"): - parallel(failsafe): -# - call: build-native(ios) + - call: build-native(ios) - call: build-native(android) - call: run-sonar-analysis - call: publish-to-hygieia @@ -383,8 +383,6 @@ flows: - (set version code) bundle exec fastlane set_ios build_number:${BUILD_NUMBER} - call: ios-process else: - - echo "printing build.gradle before the fast lane setup" - - grep versionCode ./android/app/build.gradle - (set version code) bundle exec fastlane set_android version_code:${BUILD_NUMBER} - call: android-process - echo "uploading build" @@ -421,8 +419,10 @@ flows: - if: | %{os == "ios"} then: + - (set version code) bundle exec fastlane set_ios build_number:${BUILD_NUMBER} - call: ios-process else: + - (set version code) bundle exec fastlane set_android version_code:${BUILD_NUMBER} - call: android-process - (name create release tag) sh scripts/releaseTagging.sh "${version}" - echo "uploading build" @@ -510,8 +510,6 @@ flows: #!/bin/sh -x echo "env is ${env}" echo "CI is ${CI}" - echo "before actual build-android and after fastlane what is the android version" - grep versionCode ./app/build.gradle first=${env:0:1} rest=${env:1} firstUpper=`echo ${first} |tr '[:lower:]' '[:upper:]'`
added version code
added version code
5787f3d6b44dad876cb241614042ef4d0575a503
--- packages/associate-exp-hub-hub/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.12.0](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-hub@2.11.0...@walmart/associate-exp-hub-hub@2.12.0) (2025-11-18) + +### Features + +- **ui:** remove the isSiteDC prop drilling ([644cdd8](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/commit/644cdd8b0fd2b64f011e954a52963022dde07820)) + # [2.11.0](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-hub@2.10.2...@walmart/associate-exp-hub-hub@2.11.0) (2025-11-14) ### Features --- packages/associate-exp-hub-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/associate-exp-hub-hub", - "version": "2.11.0", + "version": "2.12.0", "description": "Hub Framework module for Associate Experience Hub - can be moved to @walmart/my-walmart-hub", "packageManager": "yarn@4.6.0", "engines": { --- packages/associate-exp-hub-mini-app/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.4.0-alpha.41](https://gecgithub01.walmart.com/smdv/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-mini-app@1.4.0-alpha.40...@walmart/associate-exp-hub-mini-app@1.4.0-alpha.41) (2025-11-18) + +### Features + +- **ui:** remove the isSiteDC prop drilling ([644cdd8](https://gecgithub01.walmart.com/smdv/associate-exp-hub-mini-app/commit/644cdd8b0fd2b64f011e954a52963022dde07820)) + # [1.4.0-alpha.40](https://gecgithub01.walmart.com/smdv/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-mini-app@1.4.0-alpha.39...@walmart/associate-exp-hub-mini-app@1.4.0-alpha.40) (2025-11-14) ### Features --- packages/associate-exp-hub-mini-app/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/associate-exp-hub-mini-app", - "version": "1.4.0-alpha.40", + "version": "1.4.0-alpha.41", "packageManager": "yarn@4.6.0", "engines": { "node": ">=18"
chore(version): updating package version
chore(version): updating package version - @walmart/associate-exp-hub-hub@2.12.0 - @walmart/associate-exp-hub-mini-app@1.4.0-alpha.41
20fc0ff98d7acf6cb799e6b02699a3198582525b
--- src/components/Roster/Roster.tsx @@ -127,8 +127,7 @@ export const Roster: React.FC<RosterProps> = (props) => { if ( !shouldSkipQuery && getDailyRosterResponse?.getDailyRoster && - !loadingDailyRoster && - !rosterDataFetchError + !loadingDailyRoster ) { const sortedAssociates = sortedAssociateList( getDailyRosterResponse?.getDailyRoster as Associate[],
adding updated roster
adding updated roster
99d6ba020b3d57cfcaa306d2d35fb409b118216a
--- package-lock.json @@ -5258,9 +5258,9 @@ "integrity": "sha512-O5l53Fi6FNLiIlMZipiqluRBN1/xNPKILeNoLFlgyG0sCLjaxK0td+u8m0Qb0QvS+UCT4A0hp6VOaXzL9ErqBg==" }, "@walmart/financial-wellbeing-feature-app": { - "version": "1.0.28", - "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.0.28.tgz", - "integrity": "sha512-vQUfd7dGMc8zb7az1GlXoYfLxKyJvZ7iOBuBTfWEka2trD+mlc7nfDo8uDu0+5A2MXi9aITT/7tvvgy1KncAXQ==", + "version": "1.0.29", + "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.0.29.tgz", + "integrity": "sha512-hVeRMG5fZ0k0EXSpy7zecfNQev72yskde+9iRWBHuboXh3CJqZ8ZRN6u8hH770+epKg+3bo19xBYl73eHpBGeQ==", "requires": { "react-native-video-player": "^0.14.0", "react-native-vimeo-iframe": "^1.2.0" @@ -5420,9 +5420,9 @@ } }, "@walmart/pay-stub-miniapp": { - "version": "0.7.7", - "resolved": "https://npme.walmart.com/@walmart/pay-stub-miniapp/-/pay-stub-miniapp-0.7.7.tgz", - "integrity": "sha512-PM88LW6GfazXj+3YYRdC68UmkpoHnf9dCkON318Mv3vdFNf6rcS21D9sjgQFEjrcjLQRLJHZgG0iGUOHaksDPw==", + "version": "0.7.8", + "resolved": "https://npme.walmart.com/@walmart/pay-stub-miniapp/-/pay-stub-miniapp-0.7.8.tgz", + "integrity": "sha512-Jn2brvANjZgjuMsSTTwSDBmxsjwxULJeT71GtrYGyFJ8gDDTk2O6kh02QGOw9vfG/2DxwTTu10yFC/dlO7Tuyg==", "requires": { "@walmart/gtp-shared-components": "^1.8.8", "crypto-js": "^3.3.0"
Update package-lock.json
Update package-lock.json
9c43402ce7d61adf737067a1b6dbfb9e5fba0c74
--- packages/allspark-foundation-hub/src/HubFeature/TeamSelection/Component/SelectionBanner.tsx @@ -38,6 +38,7 @@ export const SelectionBanner = ({ selectedTeams }: selectionBannerType) => { <Body UNSAFE_style={selectionBannerStyles.title} testID='selectionBanner-label' + weight='bold' > {`${selectedTeams} ${teamLabel}`} </Body> --- packages/allspark-foundation-hub/src/HubFeature/TeamSelection/Component/TeamSelectionList.tsx @@ -234,6 +234,7 @@ export const TeamSelectionList = ({ accessibilityLabel={section.title!} UNSAFE_style={styles.areaHeader} testID='teamSelection-areaHeader' + weight='bold' > {section.title} </Body>
Update the style for team selection
Update the style for team selection
7e289daf72dd3a500c86e21eda4595ef0bb269ff
--- src/components/MyWalmartv2/Widgets/Hourly/index.ts @@ -0,0 +1,2 @@ +export * from './HourlyRosterWidget'; +export * from './mockData'; --- src/components/MyWalmartv2/Widgets/index.ts @@ -0,0 +1,2 @@ +export * from './Hourly'; +export * from './SalariedOrTeamLead'; --- src/index.tsx @@ -3,6 +3,9 @@ import {foundationModuleConfig} from './config/foundationConfig'; export * from './shared'; +// Export widgets for external use: Remove this after testing +export * from './components/MyWalmartv2/Widgets'; + export default RosterFeature.createModule({ ...foundationModuleConfig, });
chore(ui): update export for widget for mywalmart 2.0
chore(ui): update export for widget for mywalmart 2.0
abb80cc4d4d99d1e53ce5eb509bab50f39a75818
--- packages/allspark-foundation/__tests__/Config/selectors.test.ts @@ -0,0 +1,41 @@ +import { ConfigSelectors } from '../../src/Config/selectors'; + +describe('ConfigSelectors', () => { + const mockState = { + config: { + container: { + key1: 'value1', + key2: 'value2', + }, + core: { + key3: 'value3', + }, + myFeature: { + featureKey1: 'featureValue1', + }, + }, + }; + it('should return undefined if feature configuration does not exist', () => { + const featureConfigSelector = ConfigSelectors.createFeatureConfigSelector('nonExistentFeature'); + const result = featureConfigSelector(mockState); + expect(result).toBeUndefined(); + }); + it('should return default value if container configuration key does not exist', () => { + const containerConfigSelector = ConfigSelectors.createContainerConfigSelector('nonExistentKey', 'defaultValue'); + const result = containerConfigSelector(mockState); + expect(result).toBe('defaultValue'); + }); + it('should handle undefined container configuration gracefully', () => { + const stateWithoutContainer = { + ...mockState, + config: { + ...mockState.config, + container: undefined, + }, + }; + const containerConfigSelector = ConfigSelectors.createContainerConfigSelector('key1', 'defaultValue'); + const result = containerConfigSelector(stateWithoutContainer); + expect(result).toBe('defaultValue'); + }); + }); + \ No newline at end of file --- packages/allspark-foundation/__tests__/Container/ActiveContainerManager.test.tsx @@ -0,0 +1,45 @@ +import { render } from '@testing-library/react-native'; +import { Text } from 'react-native'; +import { ActiveAllsparkContainer } from '../../src/Container/ActiveContainerManager'; +import { AllsparkContainer } from '../../src/Container/AllsparkContainer'; + +jest.mock('../../src/Container/AllsparkContainer', () => { + return { + AllsparkContainer: jest.fn().mockImplementation(() => ({ + SetupGuard: jest.fn(), + ConnectGuard: jest.fn(({ children }) => <>{children}</>), + FeatureGuard: jest.fn(({ children }) => <>{children}</>), + addSetup: jest.fn(), + addFlow: jest.fn(), + runFlow: jest.fn(), + addFeatures: jest.fn(), + connectFeatures: jest.fn(), + addAndConnectFeatures: jest.fn(), + addListener: jest.fn(), + enableFeature: jest.fn(), + disableFeature: jest.fn(), + eventManager: { + addListener: jest.fn().mockReturnValue({ remove: jest.fn() }), + }, + features: { + Screens: 'mockScreens', + }, + })), + }; + }); + + describe('ActiveAllsparkContainer', () => { + let mockContainer: AllsparkContainer; + + beforeEach(() => { + mockContainer = new AllsparkContainer(); + ActiveAllsparkContainer.setActiveContainer(mockContainer); + }); + it('call addSetup on the active container', () => { + const setupType = 'someSetupType'; + const setupFn = jest.fn(); + ActiveAllsparkContainer.addSetup(setupType, setupFn); + expect(mockContainer.addSetup).toHaveBeenCalledWith(setupType, setupFn); + }); + }); + \ No newline at end of file
active container manager test
active container manager test
a5bb63d4ecfa8e31b62deda79e505370271ee35f
--- package-lock.json @@ -4553,9 +4553,9 @@ } }, "@walmart/core-services": { - "version": "1.0.9", - "resolved": "https://npme.walmart.com/@walmart/core-services/-/core-services-1.0.9.tgz", - "integrity": "sha512-W7eDuVwBt/ervxiW3B2BhghT//ZDRuIVZTnolpuRxP72nDgRCFl9ODkEdsOF4LBLJLrMULX5UqgU54A54eI6/g==", + "version": "1.0.10", + "resolved": "https://npme.walmart.com/@walmart/core-services/-/core-services-1.0.10.tgz", + "integrity": "sha512-97b18+NIsbsLxQPszRudUH/5l1naPup6DiE2GXUrDYGTi5ORRTGG3rVZnG9kptpHmLf+zxxf9o9P6vlJd/lH5w==", "requires": { "@walmart/core-utils": "^1.0.8", "axios": "^0.26.0", @@ -4592,9 +4592,9 @@ } }, "@walmart/core-services-allspark": { - "version": "1.2.4", - "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-1.2.4.tgz", - "integrity": "sha512-cV/Nsfv6j7dGI98/PP+fGV1goTVC+Zf5AxQzauqpms3c6PTPd7P/krX9Yng2aebGSwV2NfYjTMVHUKqTovBwXQ==", + "version": "1.2.5", + "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-1.2.5.tgz", + "integrity": "sha512-nCNwOxBsD01/N1ihRYJAgoTWvOz/fItntr24G212LcpjHv8hwFwp2C5pQlforePAVMiIPt132mjmJvaLRBW+iQ==", "requires": { "axios": "^0.26.0", "crypto-js": "^4.1.1", --- package.json @@ -75,8 +75,8 @@ "@walmart/allspark-neon-core": "0.1.26", "@walmart/ask-sam-mini-app": "^0.41.8", "@walmart/config-components": "3.0.2", - "@walmart/core-services": "^1.0.9", - "@walmart/core-services-allspark": "^1.2.4", + "@walmart/core-services": "^1.0.10", + "@walmart/core-services-allspark": "^1.2.5", "@walmart/core-utils": "^1.0.8", "@walmart/counts-component-miniapp": "0.0.35", "@walmart/exception-mini-app": "0.41.1", --- src/redux/SharedSelectors.ts @@ -80,5 +80,5 @@ export const getUpdateChecksState = (state: any) => state.updateChecks; export const getNetworkType = createSelector( [NetworkGlobalSelectors.getNetworkState], - NetworkStateSelectors.getType, + NetworkStateSelectors.getConnectionType, );
fixing selector and bumping core services
fixing selector and bumping core services
91ab4cf3d7c6466575656b3be4cce0d4376ba18c
--- apps/example/package.json @@ -35,6 +35,7 @@ "expo": "^53.0.0", "expo-build-properties": "~0.14.8", "expo-doctor": "^1.10.1", + "expo-image": "~2.4.0", "expo-linking": "~7.1.7", "expo-local-authentication": "~16.0.5", "jwt-decode": "^3.1.2", --- packages/allspark-foundation/src/Nudge/helpers.tsx @@ -75,17 +75,17 @@ export const buildNudgeConfig = async (lang: string): Promise<NudgeConfigType> = | ICoreNudge | IFeatureNudge ); - const optionalTitle = `optional.title.${parsedDeviceLanguage}` as keyof ( + const optionalTitle = `optional.title.${lang}` as keyof ( | ICoreNudge | IFeatureNudge ); const mandatoryDescription = - `mandatory.description.${parsedDeviceLanguage}` as keyof ( + `mandatory.description.${lang}` as keyof ( | ICoreNudge | IFeatureNudge ); const optionalDescription = - `optional.description.${parsedDeviceLanguage}` as keyof ( + `optional.description.${lang}` as keyof ( | ICoreNudge | IFeatureNudge ); --- packages/allspark-foundation/src/Nudge/hooks/useNudgeConfig.tsx @@ -107,7 +107,7 @@ export const useNudgeConfig = ({ */ const logNudgeEvent = useCallback(() => { Promise.all([ - buildNudgeConfig(i18n.languages[0]), + buildNudgeConfig(i18n?.languages?.[0] || 'en-US'), hasNudgeDateExpired(featureId, coreNudge.nudgeFrequencyDisplay), ]) .then( --- yarn.lock @@ -13102,6 +13102,7 @@ __metadata: expo: "npm:^53.0.0" expo-build-properties: "npm:~0.14.8" expo-doctor: "npm:^1.10.1" + expo-image: "npm:~2.4.0" expo-linking: "npm:~7.1.7" expo-local-authentication: "npm:~16.0.5" fs-extra: "npm:^11.2.0" @@ -23569,11 +23570,11 @@ __metadata: "typescript@patch:typescript@npm%3A>=3 < 6#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.4.4#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.7.3#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.8.3#optional!builtin<compat/typescript>": version: 5.9.2 - resolution: "typescript@patch:typescript@npm%3A5.9.2%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252Ftypescript%252F-%252Ftypescript-5.9.2.tgz#optional!builtin<compat/typescript>::version=5.9.2&hash=5786d5" + resolution: "typescript@patch:typescript@npm%3A5.9.2%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252Ftypescript%252F-%252Ftypescript-5.9.2.tgz#optional!builtin<compat/typescript>::version=5.9.2&hash=74658d" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/34d2a8e23eb8e0d1875072064d5e1d9c102e0bdce56a10a25c0b917b8aa9001a9cf5c225df12497e99da107dc379360bc138163c66b55b95f5b105b50578067e + checksum: 10c0/66fc07779427a7c3fa97da0cf2e62595eaff2cea4594d45497d294bfa7cb514d164f0b6ce7a5121652cf44c0822af74e29ee579c771c405e002d1f23cf06bfde languageName: node linkType: hard @@ -23589,11 +23590,11 @@ __metadata: "typescript@patch:typescript@npm%3A~5.8.3#optional!builtin<compat/typescript>": version: 5.8.3 - resolution: "typescript@patch:typescript@npm%3A5.8.3%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252Ftypescript%252F-%252Ftypescript-5.8.3.tgz#optional!builtin<compat/typescript>::version=5.8.3&hash=5786d5" + resolution: "typescript@patch:typescript@npm%3A5.8.3%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252Ftypescript%252F-%252Ftypescript-5.8.3.tgz#optional!builtin<compat/typescript>::version=5.8.3&hash=74658d" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/39117e346ff8ebd87ae1510b3a77d5d92dae5a89bde588c747d25da5c146603a99c8ee588c7ef80faaf123d89ed46f6dbd918d534d641083177d5fac38b8a1cb + checksum: 10c0/92ea03509e06598948559ddcdd8a4ae5a7ab475766d5589f1b796f5731b3d631a4c7ddfb86a3bd44d58d10102b132cd4b4994dda9b63e6273c66d77d6a271dbd languageName: node linkType: hard
chore(lib): ALLSPARK-6922 lib updates (#392)
chore(lib): ALLSPARK-6922 lib updates (#392) Co-authored-by: Maksym Novakh <maksym.novakh@walmart.com>
33fb2b8f988b98e6a42d4a4981632e6b31ac400a
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.47.0", + "version": "2.48.0", "main": "dist/index.js", "files": [ "dist",
feat(ui): upgrade version to 2.48.0 and update looper yml
feat(ui): upgrade version to 2.48.0 and update looper yml
a701c71b2bffc22bf8536379a8d5931b64cbfe4f
--- ios/Podfile.lock @@ -615,8 +615,6 @@ PODS: - BoringSSL-GRPC/Implementation (0.0.24): - BoringSSL-GRPC/Interface (= 0.0.24) - BoringSSL-GRPC/Interface (0.0.24) - - BVLinearGradient (2.6.2): - - React-Core - CocoaAsyncSocket (7.6.5) - CodePush (8.2.2): - Base64 (~> 1.1) @@ -2250,7 +2248,6 @@ PODS: DEPENDENCIES: - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) - - BVLinearGradient (from `../node_modules/react-native-linear-gradient`) - CocoaAsyncSocket - CodePush (from `../node_modules/react-native-code-push`) - "compass-sdk-rn (from `../node_modules/@walmart/compass-sdk-rn`)" @@ -2479,8 +2476,6 @@ SPEC REPOS: EXTERNAL SOURCES: boost: :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec" - BVLinearGradient: - :path: "../node_modules/react-native-linear-gradient" CodePush: :path: "../node_modules/react-native-code-push" compass-sdk-rn: @@ -2732,7 +2727,6 @@ SPEC CHECKSUMS: Base64: cecfb41a004124895a7bcee567a89bae5a89d49b boost: 26fad476bfa736552bbfa698a06cc530475c1505 BoringSSL-GRPC: 3175b25143e648463a56daeaaa499c6cb86dad33 - BVLinearGradient: 34a999fda29036898a09c6a6b728b0b4189e1a44 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 CodePush: eaa66fc8dd9ff611304ecc48397ce8831ba79ac9 compass-sdk-ios: 8077b7076d749de27c83846bad97ecde13f28657 @@ -2910,7 +2904,7 @@ SPEC CHECKSUMS: walmart-react-native-sumo-sdk: a6dc20c0ec3c8ab878886529a0e2fc22e747821c WebexSDK: d652713bd7ad5902e81918121912ba75a0056c3b wifi-store-locator: 501fca0a220c725ed93ab403635c0f246a8ce7e3 - Yoga: 47d399a73c0c0caa9ff824e5c657eae31215bfee + Yoga: c716aea2ee01df6258550c7505fa61b248145ced PODFILE CHECKSUM: fc93c11e2096b0f20e15b7c98c1efea2b0908817
remove unneeded pod updates
remove unneeded pod updates
3a00ae99628a1770059b618f26baf13f747a6ae2
--- package-lock.json @@ -74,13 +74,13 @@ "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.5.1", - "@walmart/receipt-check-miniapp": "1.9.10", + "@walmart/receipt-check-miniapp": "1.9.11", "@walmart/redux-store": "3.1.3", "@walmart/returns-mini-app": "0.12.0", "@walmart/schedule-mini-app": "0.33.0", "@walmart/settings-mini-app": "1.12.0", "@walmart/shelfavailability-mini-app": "1.5.11", - "@walmart/taskit-mini-app": "0.49.11", + "@walmart/taskit-mini-app": "0.49.12", "@walmart/time-clock-mini-app": "2.25.0", "@walmart/ui-components": "1.9.0", "@walmart/welcomeme-mini-app": "0.76.0", @@ -5861,9 +5861,9 @@ } }, "node_modules/@walmart/receipt-check-miniapp": { - "version": "1.9.10", - "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.9.10.tgz", - "integrity": "sha512-vbchzFQoNaKBxoFLSrHn+Dpkg7lLE9xnNfxGYEhRZ+TV81IIqCVT8LZeBJ4g7k3lP3pePQbGSbXDi6ycvPK3BQ==", + "version": "1.9.11", + "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.9.11.tgz", + "integrity": "sha512-DvUnh4c68PSXcSvfdzAfW1sB3mxUF9K9OvkZwN4seJK6S7/4I7RgdXr/AX4ET2iLXAZIfXYoiuScojHwPkR1/g==", "dependencies": { "@walmart/tcnumber": "^2.3.3", "@xstate/react": "^3.0.1", @@ -5879,6 +5879,7 @@ "@walmart/redux-store": "^2.0.4", "react": "^17.0.2", "react-native": "^0.67.4", + "react-native-device-info": "^10.3.0", "react-redux": "^7.2.1", "redux": "^4.1.2" } @@ -6064,9 +6065,9 @@ } }, "node_modules/@walmart/taskit-mini-app": { - "version": "0.49.11", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.49.11.tgz", - "integrity": "sha512-D0Oi1XUgIvxIVjQL2wl0nyeTJr0Sqcvtezbag3ZG0tMlwxGJMXNB2PvkQ5n8JBuAV1YRlggsGtIp+yLz+slgCQ==", + "version": "0.49.12", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.49.12.tgz", + "integrity": "sha512-Qv9d7niybQ9sVyN87KI3gpbSa3I+QVLwf+TjW+l+mgG1LHRUou8uCygL5bfKDOB6acg5FqFKQ+x/ccEv74Fhtg==", "peerDependencies": { "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@types/lodash": ">=4.14.176", @@ -25550,9 +25551,9 @@ "integrity": "sha512-CxtyZsPMfyN6081C10uIPoP93aWLl4gHGRgiI8p7bwhIJLl8NiuOl/bqdvE3N7pAZYTeKG7lSxtc88++uvJKWA==" }, "@walmart/receipt-check-miniapp": { - "version": "1.9.10", - "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.9.10.tgz", - "integrity": "sha512-vbchzFQoNaKBxoFLSrHn+Dpkg7lLE9xnNfxGYEhRZ+TV81IIqCVT8LZeBJ4g7k3lP3pePQbGSbXDi6ycvPK3BQ==", + "version": "1.9.11", + "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.9.11.tgz", + "integrity": "sha512-DvUnh4c68PSXcSvfdzAfW1sB3mxUF9K9OvkZwN4seJK6S7/4I7RgdXr/AX4ET2iLXAZIfXYoiuScojHwPkR1/g==", "requires": { "@walmart/tcnumber": "^2.3.3", "@xstate/react": "^3.0.1", --- package.json @@ -116,7 +116,7 @@ "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.5.1", - "@walmart/receipt-check-miniapp": "1.9.10", + "@walmart/receipt-check-miniapp": "1.9.11", "@walmart/redux-store": "3.1.3", "@walmart/returns-mini-app": "0.12.0", "@walmart/schedule-mini-app": "0.33.0", --- src/translations/es-MX.ts @@ -24,7 +24,7 @@ export const esMX = { '@walmart/price-changes-mini-app': 'Cambios de precios', '@walmart/profile-feature-app': 'Associate Profile', '@walmart/push-to-talk-mini-app': 'Push To Talk', - '@walmart/receipt-check-miniapp': 'cheque de recibo', + '@walmart/receipt-check-miniapp': 'Cheque de recibo', '@walmart/refrigeration-alarms-mini-app': 'Alarmas de Refrigeración', '@walmart/returns-mini-app': 'Devoluciones', '@walmart/schedule-mini-app': 'Schedules',
update for 9.1
update for 9.1
440572d709c843e0162f77bb0e20765c8af1e8a5
--- android/app/build.gradle @@ -134,7 +134,7 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 116 + versionCode 117 versionName "1.0.9" } splits { --- ios/AllSpark/Info.plist @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>116</string> + <string>117</string> <key>FirebaseAutomaticScreenReportingEnabled</key> <false /> <key>LSApplicationQueriesSchemes</key>
Incrementing build number
Incrementing build number
26cf73f715a79c986048f358774333e437659e09
--- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.0.0-alpha.3", + "version": "1.0.0-alpha.4", "description": "", "main": "Core/index.js", "types": "Core/index.d.ts",
Update package version for foundation hub
Update package version for foundation hub