commit_hash
stringlengths
40
40
input
stringlengths
13
7.99k
output
stringlengths
5
155
full_message
stringlengths
6
8.96k
0471f333198eef0e0ade9f3044fe99b6fcdec996
--- package-lock.json @@ -4604,9 +4604,9 @@ "integrity": "sha512-9YbDcX9uH3GadaI8ZTgULp9GDOvu7tYRWFOpyLrEA6KWbYpGfTHjRcjm1mmFpDzDQrjJAmCNsFSmiOA/Uwu2MA==" }, "@walmart/time-clock-mini-app": { - "version": "0.5.2", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.5.2.tgz", - "integrity": "sha512-tw6aB5kYfnNyKgjI/HhCR8xFTSgL7P/LZGg2mQgPZ2xiZWgF9ChgBkcUC4VWW61anNWDQK8tjJGQzOEVy80tVg==", + "version": "0.5.3", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.5.3.tgz", + "integrity": "sha512-xjHWEXdaDHh1QLYGbLCmh3fv1h7/Y5Xe+5EnRmzvU2Iej4h6Ve6P5ZQ5F3pcbOtxFKd2EVjtLbc3WFIsfLBdmg==", "requires": { "@react-native-community/datetimepicker": "3.0.9", "@react-native-picker/picker": "^1.16.1", @@ -16184,7 +16184,7 @@ "nano-time": { "version": "1.0.0", "resolved": "https://npme.walmart.com/nano-time/-/nano-time-1.0.0.tgz", - "integrity": "sha1-sFVPaa2J4i0JB/ehKwmTpdlhN+8=", + "integrity": "sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==", "requires": { "big-integer": "^1.6.16" } @@ -18480,9 +18480,9 @@ "integrity": "sha512-5XwA0/NyFTqF2QqPeSs89LrK2337a2pfoLX44HlRCXLeHOVbZjC+CFkCuMW6k1u+RnSbDv3ROR44jdV6Dul+9A==" }, "react-query": { - "version": "3.34.16", - "resolved": "https://npme.walmart.com/react-query/-/react-query-3.34.16.tgz", - "integrity": "sha512-7FvBvjgEM4YQ8nPfmAr+lJfbW95uyW/TVjFoi2GwCkF33/S8ajx45tuPHPFGWs4qYwPy1mzwxD4IQfpUDrefNQ==", + "version": "3.39.1", + "resolved": "https://npme.walmart.com/react-query/-/react-query-3.39.1.tgz", + "integrity": "sha512-qYKT1bavdDiQZbngWZyPotlBVzcBjDYEJg5RQLBa++5Ix5jjfbEYJmHSZRZD+USVHUSvl/ey9Hu+QfF1QAK80A==", "requires": { "@babel/runtime": "^7.5.5", "broadcast-channel": "^3.4.1", @@ -18873,7 +18873,7 @@ "remove-accents": { "version": "0.4.2", "resolved": "https://npme.walmart.com/remove-accents/-/remove-accents-0.4.2.tgz", - "integrity": "sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U=" + "integrity": "sha512-7pXIJqJOq5tFgG1A2Zxti3Ht8jJF337m4sowbuHsW30ZnkQFnDzy9qBNhgzX8ZLW4+UBcXiiR7SwR6pokHsxiA==" }, "remove-trailing-separator": { "version": "1.1.0", --- package.json @@ -102,7 +102,7 @@ "@walmart/settings-mini-app": "1.6.0", "@walmart/shelfavailability-mini-app": "0.8.7", "@walmart/taskit-mini-app": "0.24.0", - "@walmart/time-clock-mini-app": "0.5.2", + "@walmart/time-clock-mini-app": "0.5.3", "@walmart/ui-components": "1.4.0-rc.0", "@walmart/welcomeme-mini-app": "0.63.0", "@walmart/wfm-ui": "0.2.14",
Bump time clock mini app to 0.5.3 for drop 7 bug fixes
Bump time clock mini app to 0.5.3 for drop 7 bug fixes
b8cafccc5d8e32ebb55962e71755d38b72385200
--- core/__tests__/home/components/__snapshots__/LinkCardTest.tsx.snap @@ -69,77 +69,6 @@ exports[`LinkCard matches snapshot 1`] = ` </View> `; -exports[`LinkCard matches snapshot when clocked in and clock check not required and from non BYOD state 1`] = `null`; - -exports[`LinkCard matches snapshot when not clocked in and clock check not required 1`] = ` -<View - accessibilityLabel="Share your idea" - accessibilityState={ - { - "busy": undefined, - "checked": undefined, - "disabled": undefined, - "expanded": undefined, - "selected": undefined, - } - } - accessibilityValue={ - { - "max": undefined, - "min": undefined, - "now": undefined, - "text": undefined, - } - } - accessible={true} - collapsable={false} - focusable={true} - onClick={[Function]} - onResponderGrant={[Function]} - onResponderMove={[Function]} - onResponderRelease={[Function]} - onResponderTerminate={[Function]} - onResponderTerminationRequest={[Function]} - onStartShouldSetResponder={[Function]} - style={ - { - "backgroundColor": "#e6f1fc", - "borderRadius": 8, - "elevation": 3, - "flexDirection": "row", - "justifyContent": "space-between", - "opacity": 1, - "paddingHorizontal": 16, - "paddingVertical": 18, - "shadowColor": "rgba(0, 0, 0, 0.15)", - "shadowOffset": { - "height": 1, - "width": 0, - }, - "shadowOpacity": 1, - "shadowRadius": 2, - } - } - testID="linkCard" -> - <Text - style={ - { - "color": "#2e2f32", - "fontFamily": "Bogle-Bold", - "fontSize": 14, - } - } - > - Share your idea - </Text> - <ExternalLinkIcon - color="#2e2f32" - size={24} - /> -</View> -`; - exports[`LinkCard matches snapshot when not clocked in and clock check required 1`] = `null`; exports[`LinkCard matches snapshot with string title 1`] = `
fix tests
fix tests
5689c89198049654d76469ac530506b241e1be4e
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "3.2.1-alpha.2", + "version": "3.2.1-alpha.3", "main": "dist/index.js", "files": [ "dist", @@ -89,7 +89,7 @@ "@walmart/react-native-scanner-3.0": "0.10.4", "@walmart/react-native-sumo-sdk": "2.8.0", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "3.1.1-alpha.1", + "@walmart/wmconnect-mini-app": "3.2.0-alpha.1", "babel-jest": "^29.6.3", "chance": "^1.1.11", "crypto-js": "~4.2.0", --- yarn.lock @@ -6346,7 +6346,7 @@ __metadata: "@walmart/react-native-scanner-3.0": "npm:0.10.4" "@walmart/react-native-sumo-sdk": "npm:2.8.0" "@walmart/ui-components": "npm:1.15.1" - "@walmart/wmconnect-mini-app": "npm:3.1.1-alpha.1" + "@walmart/wmconnect-mini-app": "npm:3.2.0-alpha.1" babel-jest: "npm:^29.6.3" chance: "npm:^1.1.11" crypto-js: "npm:~4.2.0" @@ -6429,9 +6429,9 @@ __metadata: languageName: node linkType: hard -"@walmart/wmconnect-mini-app@npm:3.1.1-alpha.1": - version: 3.1.1-alpha.1 - resolution: "@walmart/wmconnect-mini-app@npm:3.1.1-alpha.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-3.1.1-alpha.1.tgz" +"@walmart/wmconnect-mini-app@npm:3.2.0-alpha.1": + version: 3.2.0-alpha.1 + resolution: "@walmart/wmconnect-mini-app@npm:3.2.0-alpha.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-3.2.0-alpha.1.tgz" peerDependencies: "@walmart/allspark-foundation": ">=6.32.0" expo: ~52.0.46 @@ -6442,7 +6442,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/5619f33707641ef190a21e2de81c7a958cdac075e1fd66445ec7055be8f9750078fbd4992858537316444756c00bdfaf677b38a93c7c3e8fbc58ac13867de338 + checksum: 10c0/98f0be0e6c7653e775c5364b881059d526cbb9d942d2fb632d706e7c28543696ba68b65ea786742c5a0a9a70e7e6db12af3a63482a8593e934fab90e75f5607e languageName: node linkType: hard
feat(ui): updating roster version for drop 33
feat(ui): updating roster version for drop 33
26edf3058a059a51e679e44fd3522f3cd7248aea
--- src/managerExperience/screens/AllTeamsScreen/AllTeamsScreen.tsx @@ -3,6 +3,7 @@ import {useTranslation} from 'react-i18next'; import {ROSTER_I18N_NAMESPACE} from '../../../translations'; import {View, SectionList, Text} from 'react-native'; import {TeamListItem} from '@walmart/allspark-foundation/Components/TeamListItem'; +import {ErrorScreen} from '@walmart/allspark-foundation/HubFeature/Onboarding/TeamSelection/Component/ErrorScreen'; import {AllTeamsScreenStyles as styles} from './styles'; import { useGetTeamById, @@ -18,17 +19,21 @@ export const AllTeamsScreen = () => { const primaryTeamData = useGetTeamById(primaryTeamId); const primaryTeamDetails = primaryTeamData.data?.getTeamById; const primaryTeamArea = primaryTeamDetails?.workgroup ?? ''; - const {loading, data} = useGetTeamsByStore(); + const {loading, data, refetch} = useGetTeamsByStore(); const allTeams = data?.getTeamsByStore; const isErrorFetchingTeams = !allTeams || !primaryTeamId || !allTeams.every((team) => team !== null); - //TODO: Add error screen if (isErrorFetchingTeams) return ( - <View> - <Text>Error screen</Text> - </View> + <ErrorScreen + errorTitle={t('rosterScreen.allTeamsScreen.somethingWentWrong')} + errorMessage={t('rosterScreen.allTeamsScreen.refreshThisPage')} + buttonText={t('rosterScreen.allTeamsScreen.refreshPage')} + handleButtonPress={() => { + refetch(); + }} + /> ); const totalClockedInAssociates = allTeams.reduce((acc, currentTeam) => { --- src/translations/en-US.ts @@ -55,6 +55,11 @@ export const enUS = { showTeamsFooter: 'Show teams', hideTeamsFooter: 'Hide teams', }, + allTeamsScreen: { + somethingWentWrong: 'Something went wrong', + refreshThisPage: 'Refresh this page to try again.', + refreshPage: 'Refresh page', + }, teamWorkgroup: { myTeam: 'My team', myArea: 'My area', --- src/translations/es-MX.ts @@ -55,6 +55,11 @@ export const esMX = { showTeamsFooter: 'Mostrar Equipos', hideTeamsFooter: 'Ocultar Equipos', }, + allTeamsScreen: { + somethingWentWrong: 'Algo salió mal', + refreshThisPage: 'Actualice esta página para volver a intentarlo.', + refreshPage: 'Actualizar página', + }, teamWorkgroup: { myTeam: 'Mi equipo', myArea: 'Mi área',
feat: added error screen to all teams screen
feat: added error screen to all teams screen
ae1db16f08c7667ab266e84cb22e8bb8bee14e72
--- src/core/wmConfigInit.ts @@ -19,7 +19,7 @@ export const initWmConfig = async () => { // TODO log set config error store.dispatch(WmConfigActionCreators.wmConfigSetConfigFailed(error)); }) - .finally(async () => { + .then(async () => { try { await wmConfig.fetchAndActivate(); } catch (error) {
fix code so looper will build, does not understand finally clause duing build (#111)
fix code so looper will build, does not understand finally clause duing build (#111)
ef13be7356db7215c5c7cfd648aa08462c95874d
--- packages/allspark-foundation/__tests__/Config/saga.test.ts @@ -0,0 +1,84 @@ +import { call, select, take, takeLatest } from 'redux-saga/effects'; +import { ConfigActionTypes, ConfigActionCreators } from '../../src/Config/redux'; +import { ConfigSelectors } from '../../src/Config/selectors'; +import { onInit, onFetch, waitForConfigInit, waitForConfigFetch, ConfigActionSagas } from '../../src/Config/sagas'; + + +describe('Config Sagas', () => { + afterEach(() => { + jest.clearAllMocks(); + }); + + it('should handle onInit saga correctly', () => { + const action = ConfigActionCreators.INIT({ test: 'data' }); + const generator = onInit(action); + + expect(generator.next().value).toEqual(undefined); + expect(generator.next().done).toBe(true); + }); + + it('should handle onFetch saga correctly', () => { + const action = ConfigActionCreators.FETCH({ test: 'data' }); + const generator = onFetch(action); + expect(generator.next().value).toEqual(undefined); + expect(generator.next().done).toBe(true); + }); + + it('should handle ConfigActionSagas correctly', () => { + const generator = ConfigActionSagas; + expect(generator[0]).toEqual(takeLatest(ConfigActionTypes.INIT, onInit)); + expect(generator[1]).toEqual(takeLatest(ConfigActionTypes.FETCH, onFetch)); + }); + + it('should handle waitForConfigInit saga immediately if already initialized', () => { + const generator = waitForConfigInit(); + expect(generator.next().value).toEqual(select(ConfigSelectors.getInitializing)); + expect(generator.next(false).value).toEqual(select(ConfigSelectors.getInitialized)); + expect(generator.next(true).done).toBe(false); + expect(generator.next().value).toEqual(undefined); + }); + + it('should handle waitForConfigInit saga correctly', () => { + const generator = waitForConfigInit(); + expect(generator.next().value).toEqual(select(ConfigSelectors.getInitializing)); + expect(generator.next(true).value).toEqual(select(ConfigSelectors.getInitialized)); + expect(generator.next(false).value).toEqual(take([ConfigActionTypes.INIT_SUCCESS, ConfigActionTypes.INIT_ERROR])); + expect(generator.next({ type: ConfigActionTypes.INIT_ERROR }).value).toEqual( + select(ConfigSelectors.getInitialized) + ); + expect(generator.next(false).done).toBe(true); + expect(generator.next().value).toEqual(undefined); + }); + + it('should handle waitForConfigInit saga immediately if already initialized', () => { + const generator = waitForConfigInit(); + expect(generator.next().value).toEqual(select(ConfigSelectors.getInitializing)); + expect(generator.next(false).value).toEqual(select(ConfigSelectors.getInitialized)); + expect(generator.next(true).done).toBe(false); + expect(generator.next().value).toEqual(undefined); + }); + + it('waitForConfigInit should return data immediately if not loading, data is loaded, and no error', () => { + const generator = waitForConfigInit(); + expect(generator.next().value).toEqual(select(ConfigSelectors.getLoading)); + expect(generator.next(false).value).toEqual(select(ConfigSelectors.getLoaded)); + expect(generator.next(true).value).toEqual(select(ConfigSelectors.getError)); + expect(generator.next(false).done).toBe(false); + expect(generator.next().value).toEqual(undefined); + }); + + it('should handle waitForConfigFetch saga immediately if already fetched', () => { + const generator = waitForConfigFetch(); + expect(generator.next().value).toEqual(select(ConfigSelectors.getLoading)); + expect(generator.next(true).value).toEqual(select(ConfigSelectors.getLoaded)); + expect(generator.next(false).value).toEqual(select(ConfigSelectors.getError)); + expect(generator.next(false).value).toEqual( + take([ConfigActionTypes.FETCH_SUCCESS, ConfigActionTypes.FETCH_ERROR]) + ); + expect(generator.next({ type: ConfigActionTypes.FETCH_SUCCESS }).value).toEqual( + select(ConfigSelectors.getData) + ); + expect(generator.next().done).toBe(true); + expect(generator.next().value).toEqual(undefined); + }); +}); \ No newline at end of file
added unit test for config sagas
added unit test for config sagas
f8f47a1e91ac46ad866134450ad57a7acb56eccb
--- targets/US/package.json @@ -86,7 +86,7 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.24.7", "@walmart/associate-listening-mini-app": "1.2.7", - "@walmart/attendance-mini-app": "3.89.0", + "@walmart/attendance-mini-app": "3.90.0", "@walmart/avp-feature-app": "0.10.7", "@walmart/avp-shared-library": "0.10.1", "@walmart/backroom-mini-app": "1.5.20",
bump ama verion 3.90.0
bump ama verion 3.90.0
fef5ba8b8c51fe0f656c2ea418b096e9f7ae0b21
--- __tests__/navigation/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -199,7 +199,9 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects name="emergency.banner" options={ Object { - "gestureDirection": "vertical", + "gestureEnabled": false, + "headerShown": true, + "title": "navigation.emergency", } } />
update snapshot
update snapshot
04b96f524ca0186ae3e115838fd12633efe9c095
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/wmconnect-mini-app", - "version": "3.8.2", + "version": "3.8.3", "main": "dist/index.js", "files": [ "dist",
feat(ui): update wmconnect version
feat(ui): update wmconnect version
aa9898d7987e50106b83e994436138e38a9c3c22
--- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/texting-mini-app", - "version": "2.0.20", + "version": "2.0.21", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/texting-mini-app", - "version": "2.0.20", + "version": "2.0.21", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.8.4", --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/texting-mini-app", - "version": "2.0.20", + "version": "2.0.21", "private": false, "main": "bundle/dist/index.js", "files": [ --- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/texting-mini-app", - "version": "2.0.20", + "version": "2.0.21", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/texting-mini-app", - "version": "2.0.20", + "version": "2.0.21", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.8.4", --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/texting-mini-app", - "version": "2.0.20", + "version": "2.0.21", "private": false, "main": "bundle/dist/index.js", "files": [
version bump to 2.0.21 to release latest mini app
version bump to 2.0.21 to release latest mini app
2ce7be612ddbb6c1a273267815ada348b7baea00
--- packages/allspark-foundation/__tests__/FeatureRunner/components/FeatureSection.test.tsx @@ -1,6 +1,9 @@ import React from 'react'; import { render, fireEvent } from '../../utils'; -import { FeatureSection, LocalStorageCard } from '../../../src/FeatureRunner/components/FeatureSection'; +import { + FeatureSection, + LocalStorageCard, +} from '../../../src/FeatureRunner/components/FeatureSection'; import { AllsparkNavigationClient } from '../../../src/Navigation'; import { AllsparkFeatureModule } from '../../../src/Feature'; import { AllsparkLocalStorage } from '../../../src/LocalStorage'; @@ -52,16 +55,19 @@ describe('FeatureSection and LocalStorageCard', () => { expect(AllsparkNavigationClient.openModal).toHaveBeenCalled(); }); it('call clear LocalStorage on Clear button press', () => { - const { getByTestId } = render(<LocalStorageCard featureID="test" />); + const { getByTestId } = render(<LocalStorageCard featureID='test' />); fireEvent.press(getByTestId('clear')); expect(mockClear).toHaveBeenCalled(); }); it('call logLocalStorage on Log button press', async () => { mockGetAllKeys.mockResolvedValue(['key1', 'key2']); - mockMultiGet.mockResolvedValue([['key1', 'value1'], ['key2', 'value2']]); - const { getByTestId } = render(<LocalStorageCard featureID="test" />); + mockMultiGet.mockResolvedValue([ + ['key1', 'value1'], + ['key2', 'value2'], + ]); + const { getByTestId } = render(<LocalStorageCard featureID='test' />); await fireEvent.press(getByTestId('log')); expect(mockGetAllKeys).toHaveBeenCalled(); expect(mockMultiGet).toHaveBeenCalledWith(['key1', 'key2']); }); -}); \ No newline at end of file +}); --- packages/allspark-foundation/__tests__/HTTP/cache.test.ts @@ -1,36 +1,35 @@ import { getStorageForClient } from '../../src/HTTP/cache'; import { buildStorage } from 'axios-cache-interceptor'; -import { AllsparkLocalStorage } from '../../src//LocalStorage'; +import { AllsparkLocalStorage } from '../../src/LocalStorage'; jest.mock('../../src/LocalStorage', () => ({ AllsparkLocalStorage: { - getContainerInstance: jest.fn(), + get: jest.fn(), + set: jest.fn(), + remove: jest.fn(), getFeatureInstance: jest.fn(), }, })); describe('getStorageForClient', () => { - const mockContainerInstance = { - get: jest.fn(), - set: jest.fn(), - remove: jest.fn(), - }; beforeEach(() => { jest.clearAllMocks(); }); it('test buildStorage with default storage', async () => { - AllsparkLocalStorage.getContainerInstance.mockReturnValue(mockContainerInstance); AllsparkLocalStorage.getFeatureInstance.mockReturnValue(null); const mockBuildStorage = buildStorage as jest.Mock; getStorageForClient('default'); const storageConfig = mockBuildStorage.mock.calls[0][0]; const findResult = await storageConfig.find('key1'); - expect(mockContainerInstance.get).toHaveBeenCalledWith('key1'); + expect(AllsparkLocalStorage.get).toHaveBeenCalledWith('key1'); expect(findResult).toBeUndefined(); await storageConfig.set('key2', 'value2'); - expect(mockContainerInstance.set).toHaveBeenCalledWith('key2', JSON.stringify('value2')); + expect(AllsparkLocalStorage.set).toHaveBeenCalledWith( + 'key2', + JSON.stringify('value2') + ); await storageConfig.remove('key3'); - expect(mockContainerInstance.remove).toHaveBeenCalledWith('key3'); + expect(AllsparkLocalStorage.remove).toHaveBeenCalledWith('key3'); }); it('buildStorage with configuration for feature storage', async () => { const mockFeatureInstance = { @@ -38,8 +37,9 @@ describe('getStorageForClient', () => { set: jest.fn(), remove: jest.fn(), }; - AllsparkLocalStorage.getContainerInstance.mockReturnValue(mockContainerInstance); - AllsparkLocalStorage.getFeatureInstance.mockReturnValue(mockFeatureInstance); + AllsparkLocalStorage.getFeatureInstance.mockReturnValue( + mockFeatureInstance + ); const mockBuildStorage = buildStorage as jest.Mock; getStorageForClient('feature'); const storageConfig = mockBuildStorage.mock.calls[0][0]; @@ -47,8 +47,11 @@ describe('getStorageForClient', () => { expect(mockFeatureInstance.get).toHaveBeenCalledWith('key1'); expect(findResult).toBeUndefined(); await storageConfig.set('key2', 'value2'); - expect(mockFeatureInstance.set).toHaveBeenCalledWith('key2', JSON.stringify('value2')); + expect(mockFeatureInstance.set).toHaveBeenCalledWith( + 'key2', + JSON.stringify('value2') + ); await storageConfig.remove('key3'); expect(mockFeatureInstance.remove).toHaveBeenCalledWith('key3'); }); -}); \ No newline at end of file +}); --- packages/allspark-foundation/src/HTTP/cache.ts @@ -19,12 +19,10 @@ export type { }; export const getStorageForClient = (id: string): AxiosStorage => { - const containerInstance = AllsparkLocalStorage.getContainerInstance(); - const localStorage = id === 'default' - ? containerInstance - : AllsparkLocalStorage.getFeatureInstance(id) || containerInstance; + ? AllsparkLocalStorage + : AllsparkLocalStorage.getFeatureInstance(id) || AllsparkLocalStorage; return buildStorage({ find: async (key: string) => { --- packages/core-services/src/LocalStorage/index.tsx @@ -6,22 +6,17 @@ import { import { ConsumerChild } from '@walmart/allspark-utils'; export const LegacyLocalStorageService = { - get: (key: string) => AllsparkLocalStorage.getContainerInstance().get(key), - set: (key: string, value: string) => - AllsparkLocalStorage.getContainerInstance().set(key, value), - remove: (key: string) => - AllsparkLocalStorage.getContainerInstance().remove(key), - getAllKeys: () => AllsparkLocalStorage.getContainerInstance().getAllKeys(), - merge: (key: string, value: string) => - AllsparkLocalStorage.getContainerInstance().merge(key, value), - multiGet: (keys: string[]) => - AllsparkLocalStorage.getContainerInstance().multiGet(keys), - multiRemove: (keys: string[]) => - AllsparkLocalStorage.getContainerInstance().multiRemove(keys), + get: (key: string) => AllsparkLocalStorage.get(key), + set: (key: string, value: string) => AllsparkLocalStorage.set(key, value), + remove: (key: string) => AllsparkLocalStorage.remove(key), + getAllKeys: () => AllsparkLocalStorage.getAllKeys(), + merge: (key: string, value: string) => AllsparkLocalStorage.merge(key, value), + multiGet: (keys: string[]) => AllsparkLocalStorage.multiGet(keys), + multiRemove: (keys: string[]) => AllsparkLocalStorage.multiRemove(keys), multiSet: (keyValuePairs: KeyValuePair[]) => - AllsparkLocalStorage.getContainerInstance().multiSet(keyValuePairs), + AllsparkLocalStorage.multiSet(keyValuePairs), multiMerge: (keyValuePairs: KeyValuePair[]) => - AllsparkLocalStorage.getContainerInstance().multiMerge(keyValuePairs), + AllsparkLocalStorage.multiMerge(keyValuePairs), clear: async () => {}, configure: async () => {}, };
chore: update local storage use to stop using deprecated container instance
chore: update local storage use to stop using deprecated container instance
814e378154b5ed4c162e6dbd770c788983e9934b
--- package-lock.json @@ -3315,9 +3315,9 @@ "integrity": "sha512-0/flUQXWg+fviwIXyXXjLF5HWQ6JzVOQdtdty3HjPnWcgHEhf+Ow34lXeGuwaS0tSoRcDx7a+JgshWAU5tCEEw==" }, "@walmart/feedback-all-spark-miniapp": { - "version": "0.0.50", - "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.0.50.tgz", - "integrity": "sha512-1c2ojj3Lt4ruq6DJsvnHZvQ8+3YSfxU0YnkHDZEgIGPbvv7aBku7F+IGl0/2br2zxIGN0gzDUSQBdd6QA6kw3A==" + "version": "0.0.52", + "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.0.52.tgz", + "integrity": "sha512-AianatVyjEw/mPfp7S2KJotIImR7WfQ4XGHXqNEdYAsz55pyS/q1g5kagi9WoJ1LtJp+ehUUFt4GUCe6OyicxQ==" }, "@walmart/functional-components": { "version": "1.0.27", --- package.json @@ -70,7 +70,7 @@ "@walmart/config-components": "^1.0.26", "@walmart/counts-component-miniapp": "0.0.13", "@walmart/exception-mini-app": "0.22.0", - "@walmart/feedback-all-spark-miniapp": "0.0.50", + "@walmart/feedback-all-spark-miniapp": "0.0.52", "@walmart/functional-components": "1.0.27", "@walmart/gtp-shared-components": "^1.1.8", "@walmart/impersonation-mini-app": "1.0.15",
Bumping feedback mini app version
Bumping feedback mini app version
95ce951cb20e780b98be0f8d766bc3314c7173bf
--- package.json @@ -138,7 +138,7 @@ "@walmart/react-native-webex-sdk": "0.2.11", "@walmart/receipt-check-miniapp": "1.22.11", "@walmart/redux-store": "6.1.4", - "@walmart/returns-mini-app": "4.6.0", + "@walmart/returns-mini-app": "4.11.0", "@walmart/rfid-scan-mini-app": "2.3.16", "@walmart/roster-mini-app": "2.4.0", "@walmart/schedule-mini-app": "0.114.2", --- yarn.lock @@ -6952,12 +6952,18 @@ __metadata: languageName: node linkType: hard -"@walmart/returns-mini-app@npm:4.6.0": - version: 4.6.0 - resolution: "@walmart/returns-mini-app@npm:4.6.0" +"@walmart/returns-mini-app@npm:4.11.0": + version: 4.11.0 + resolution: "@walmart/returns-mini-app@npm:4.11.0" dependencies: "@walmart/common-utilities-js": "npm:^1.2.10" "@walmart/virtual-zpl-printer-model": "npm:^0.2.11" + bmp-js: "npm:0.1.0" + buffer: "npm:6.0.3" + cpc-input: "npm:^1.7.28" + jsqr: "npm:1.4.0" + xmldom: "npm:0.6.0" + xmlserializer: "npm:0.6.1" peerDependencies: "@react-native-async-storage/async-storage": "*" "@react-navigation/native": ^5.7.3 @@ -6970,15 +6976,13 @@ __metadata: "@walmart/react-native-scanner-3.0": "*" "@walmart/react-native-shared-navigation": "*" "@walmart/redux-store": "*" - big-integer: ^1.6.51 - cpc-input: ^1.7.28 react: "*" react-native: "*" react-native-html-parser: ^0.1.0 react-native-mask-input: ^1.2.3 react-redux: "*" redux: "*" - checksum: 10c0/26902dafdc948f825e49ece56c5be34b4df87ce091b016a7987e7ac01aba25e53afeed6b3ea7a9466ffddd826dc70b234a960424c54d4724d3e6505801928a43 + checksum: 10c0/21a9b6b90ddb1e48328b32610de5e653686fd0a3bdfb8458f05666d432a603a94b5aee9382df1d8affeac275f0eede93bc5f6b92bf562bd1b10b7acc1bdaaa1c languageName: node linkType: hard @@ -7853,7 +7857,7 @@ __metadata: "@walmart/react-native-webex-sdk": "npm:0.2.11" "@walmart/receipt-check-miniapp": "npm:1.22.11" "@walmart/redux-store": "npm:6.1.4" - "@walmart/returns-mini-app": "npm:4.6.0" + "@walmart/returns-mini-app": "npm:4.11.0" "@walmart/rfid-scan-mini-app": "npm:2.3.16" "@walmart/roster-mini-app": "npm:2.4.0" "@walmart/schedule-mini-app": "npm:0.114.2" @@ -8874,6 +8878,13 @@ __metadata: languageName: node linkType: hard +"bmp-js@npm:0.1.0": + version: 0.1.0 + resolution: "bmp-js@npm:0.1.0" + checksum: 10c0/c651bd5936dcf8d67900050fac14dcbe30baf87c3d21c58f4934fcdf46172e152a87d8c0c3ca25caa2b4b2c7780ef3b5fcc6cd20afd8f0351856cadb1bef9694 + languageName: node + linkType: hard + "boolbase@npm:^1.0.0": version: 1.0.0 resolution: "boolbase@npm:1.0.0" @@ -9027,6 +9038,16 @@ __metadata: languageName: node linkType: hard +"buffer@npm:6.0.3": + version: 6.0.3 + resolution: "buffer@npm:6.0.3" + dependencies: + base64-js: "npm:^1.3.1" + ieee754: "npm:^1.2.1" + checksum: 10c0/2a905fbbcde73cc5d8bd18d1caa23715d5f83a5935867c2329f0ac06104204ba7947be098fe1317fbd8830e26090ff8e764f08cd14fefc977bb248c3487bcbd0 + languageName: node + linkType: hard + "buffer@npm:^5.4.3, buffer@npm:^5.5.0, buffer@npm:^5.6.0": version: 5.7.1 resolution: "buffer@npm:5.7.1" @@ -13080,7 +13101,7 @@ __metadata: languageName: node linkType: hard -"ieee754@npm:^1.1.13": +"ieee754@npm:^1.1.13, ieee754@npm:^1.2.1": version: 1.2.1 resolution: "ieee754@npm:1.2.1" checksum: 10c0/b0782ef5e0935b9f12883a2e2aa37baa75da6e66ce6515c168697b42160807d9330de9a32ec1ed73149aea02e0d822e572bca6f1e22bdcbd2149e13b050b17bb @@ -14799,6 +14820,13 @@ __metadata: languageName: node linkType: hard +"jsqr@npm:1.4.0": + version: 1.4.0 + resolution: "jsqr@npm:1.4.0" + checksum: 10c0/69fbfe4c866a04c97b377901a166544a583bfc76b838c275efa9af058d64e5612267079b1e96ea7b6434385803571b1c6a97a43c85f4373e8afa4f4034fc916c + languageName: node + linkType: hard + "jsx-ast-utils@npm:^2.4.1 || ^3.0.0": version: 3.3.5 resolution: "jsx-ast-utils@npm:3.3.5" @@ -22595,6 +22623,20 @@ __metadata: languageName: node linkType: hard +"xmldom@npm:0.6.0": + version: 0.6.0 + resolution: "xmldom@npm:0.6.0" + checksum: 10c0/93cbb4854f73f431a402e7942baa87a59e8445fd0b4ae6bf6af3a1007809e849da8ac70bbe1509242212bce5d19e30b55ea282cbd9d87281701d1bdc13b74623 + languageName: node + linkType: hard + +"xmlserializer@npm:0.6.1": + version: 0.6.1 + resolution: "xmlserializer@npm:0.6.1" + checksum: 10c0/3bd35dbea1c3c56c30dfda2ec98942a5d02aae238ab46f54cfb2a6f18ab6e4b727812c597e830269de181d00f5ddf5bbe32611da84c5eec26aa67ff7438c3db3 + languageName: node + linkType: hard + "xpath@npm:^0.0.32": version: 0.0.32 resolution: "xpath@npm:0.0.32"
Returns Mini App Drop 23 feature changes
Returns Mini App Drop 23 feature changes
3070828c2dc0bda6b00d7668f8a969a2443649fb
--- core/__tests__/oneClick/mockNavConfigData.js @@ -0,0 +1,91 @@ +export const mockNavConfigData = { + QUICKACTION: [ + { + id: 'ask_sam', + title: { + 'en-US': 'Questions', + 'es-MX': 'Preguntas', + }, + icon: 'icon-ask-sam', + enabled: true, + clockCheckRequired: false, + action: { + metaData: { + accessType: 'QUICK_ACTION', + }, + type: 'MODAL', + value: 'askSam', + }, + subMenuOverridden: false, + }, + ], + SIDENAV: [ + { + id: 'HolidayPlusUp', + menuType: 'MAINMENU', + title: 'Holiday Plus', + icon: 'deep-link', + enabled: true, + clockCheckRequired: false, + action: { + type: 'DEEPLINK', + value: 'https://wmt.quickbase.com/db/bqhscbpwp', + }, + subMenus: [ + {id: 'subMenu1', enabled: true}, + {id: 'subMenu2', enabled: false}, + ], + }, + { + id: 'receiptCheck', + title: 'Receipt Check', + icon: 'refrigerator-alarm', + enabled: false, + clockCheckRequired: false, + action: { + type: 'MENU', + value: 'receipt_check', + }, + }, + ], + BOTTOMNAV: [ + { + id: 'copilot', + title: { + 'en-US': 'Work', + 'es-MX': 'Trabajo', + }, + icon: 'inactive-task', + enabled: true, + clockCheckRequired: false, + action: { + type: 'BROWSE', + }, + iconSize: '20', + iconSelected: 'active-task', + subMenuOverridden: false, + }, + { + id: 'inbox', + title: { + 'en-US': 'Inbox-store', + 'es-MX': 'Bandeja de entrada', + }, + icon: 'inbox', + enabled: false, + clockCheckRequired: false, + action: { + type: 'BROWSE', + }, + iconSize: '20', + iconSelected: 'inbox-filled', + badgeInfo: { + color: '#fff200', + hideCount: true, + }, + subMenuOverridden: false, + }, + ], +}; + + --- core/__tests__/oneClick/utility/updateMegaNavCCMTest.ts @@ -1,7 +1,7 @@ import {getIsFeatureEnabled, updateMegaNavCCM} from '../../../src/oneClick/utility/updateMegaNavCCM.ts'; import _ from 'lodash'; import {NavType} from '@walmart/allspark-foundation/Navigation'; -import {mockNavConfigData} from '../../utils'; +import {mockNavConfigData} from '../mockNavConfigData'; const mockOneClickConfig = { HolidayPlusUp: {enable: true}, --- core/__tests__/utils.ts @@ -41,95 +41,3 @@ export const createMockRootStackNavigationProps = < params, }, } as StackScreenProps<RootStackMap, K>); - - export const mockNavConfigData = { - QUICKACTION: [ - { - id: 'ask_sam', - title: { - 'en-US': 'Questions', - 'es-MX': 'Preguntas', - }, - icon: 'icon-ask-sam', - enabled: true, - clockCheckRequired: false, - action: { - metaData: { - accessType: 'QUICK_ACTION', - }, - type: 'MODAL', - value: 'askSam', - }, - subMenuOverridden: false, - }, - ], - SIDENAV: [ - { - id: 'HolidayPlusUp', - menuType: 'MAINMENU', - title: 'Holiday Plus', - icon: 'deep-link', - enabled: true, - clockCheckRequired: false, - action: { - type: 'DEEPLINK', - value: 'https://wmt.quickbase.com/db/bqhscbpwp', - }, - subMenus: [ - {id: 'subMenu1', enabled: true}, - {id: 'subMenu2', enabled: false}, - ], - }, - { - id: 'receiptCheck', - title: 'Receipt Check', - icon: 'refrigerator-alarm', - enabled: false, - clockCheckRequired: false, - action: { - type: 'MENU', - value: 'receipt_check', - }, - }, - ], - BOTTOMNAV: [ - { - id: 'copilot', - title: { - 'en-US': 'Work', - 'es-MX': 'Trabajo', - }, - icon: 'inactive-task', - enabled: true, - clockCheckRequired: false, - action: { - type: 'BROWSE', - }, - iconSize: '20', - iconSelected: 'active-task', - subMenuOverridden: false, - }, - { - id: 'inbox', - title: { - 'en-US': 'Inbox-store', - 'es-MX': 'Bandeja de entrada', - }, - icon: 'inbox', - enabled: false, - clockCheckRequired: false, - action: { - type: 'BROWSE', - }, - iconSize: '20', - iconSelected: 'inbox-filled', - badgeInfo: { - color: '#fff200', - hideCount: true, - }, - subMenuOverridden: false, - }, - ], -}; - - --- core/jest.config.js @@ -21,6 +21,7 @@ module.exports = { '<rootDir>/__tests__/home/mockData/', '<rootDir>/__tests__/whatsNew/data.mock.ts', '<rootDir>/src/impersonation/', + '<rootDir>/__tests__/oneClick/mockNavConfigData.js' ], transformIgnorePatterns: [ '<rootDir>/node_modules/(?!(react-native|@walmart/core-utils|@walmart/allspark-foundation|@walmart/allspark-utils|@walmart/allspark-http-client|@walmart/core-services|@walmart/gtp-shared-components|@walmart/gtp-shared-icons|@react-native-community/picker|@walmart/redux-store|@react-native-firebase|axios|react-native-gesture-handler|@react-native|@living-design|@react-native-community/datetimepicker|@testing-library|jest-diff|jest-matcher-utils|@walmart/learning-mini-app|@walmart/wmconnect-mini-app|nanoid|react-native-reanimated|react-native-flipper|react-native-modal|react-native-animatable)/)',
Add file to jest.config
Add file to jest.config
27180a9d8a9e81bdb045f99a2034cc4ef3be4242
--- packages/allspark-foundation-hub/src/SupplyChain/Components/ShiftFilter/style.ts @@ -1,5 +1,5 @@ import { colors } from '@walmart/gtp-shared-components/dist'; -import { StyleSheet } from 'react-native'; +import { Platform, StyleSheet } from 'react-native'; //TODO: Use teamImage background color from colors gtp shared components. Currently these colors are not matching from shared components. export const ShiftFilterStyles = (selected: boolean) => @@ -15,6 +15,9 @@ export const ShiftFilterStyles = (selected: boolean) => borderColor: selected ? colors.black : colors.gray['20'], backgroundColor: colors.white, margin: 4, + ...(Platform.OS === 'android' && { + width: 100, + }), }, shiftNameContainer: { flexDirection: 'row',
feat(ui): added fixed width for android
feat(ui): added fixed width for android
acf9556ac7027996e1049d814abe17435ef6d8ee
--- package.json @@ -102,7 +102,7 @@ "@walmart/core-services-allspark": "workspace:^", "@walmart/core-widget-registry": "workspace:^", "@walmart/counts-component-miniapp": "0.2.7", - "@walmart/digital-locks-mini-app": "1.5.7", + "@walmart/digital-locks-mini-app": "1.5.8", "@walmart/emergency-mini-app": "1.32.5", "@walmart/exception-mini-app": "1.8.19", "@walmart/expo-config-plugins": "~0.5.3", --- yarn.lock @@ -7678,9 +7678,9 @@ __metadata: languageName: node linkType: hard -"@walmart/digital-locks-mini-app@npm:1.5.7": - version: 1.5.7 - resolution: "@walmart/digital-locks-mini-app@npm:1.5.7::__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.5.7.tgz" +"@walmart/digital-locks-mini-app@npm:1.5.8": + version: 1.5.8 + resolution: "@walmart/digital-locks-mini-app@npm:1.5.8::__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.5.8.tgz" peerDependencies: "@walmart/allspark-foundation": ">=6.0.0" react: "*" @@ -7689,7 +7689,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/8acb3ae879971f313ef0ed95a9e0e569c47b2ab39f2f52c56252fa9e877e5c1b45ad4d3283a3f5b6917d034c2e8cc9a5b7c34a48640d4b6d1bc76c3b321468ad + checksum: 10c0/df355f40ee02940cd0b161e41f85156ecb9950a782c1e8b8f3cd216c879ef503481b73c76a442eddd96fd819d234ee158775302f4987c57ba944c30ffa995caf languageName: node linkType: hard @@ -8318,7 +8318,7 @@ __metadata: "@walmart/core-services-allspark": "workspace:^" "@walmart/core-widget-registry": "workspace:^" "@walmart/counts-component-miniapp": "npm:0.2.7" - "@walmart/digital-locks-mini-app": "npm:1.5.7" + "@walmart/digital-locks-mini-app": "npm:1.5.8" "@walmart/emergency-mini-app": "npm:1.32.5" "@walmart/exception-mini-app": "npm:1.8.19" "@walmart/expo-config-plugins": "npm:~0.5.3"
feat(digitalkey): bumped version to 1.5.8 (#4784)
feat(digitalkey): bumped version to 1.5.8 (#4784) Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com>
dee01414a2758ffd5dd79587a7062ecfe5fd9991
--- src/auth/ErrorScreen.tsx @@ -16,6 +16,7 @@ import { PrimaryButton, RadioItemGroup, CheckboxItemGroup, + Dropdown, Subheader, Subheader2, ExclamationCircleFillIcon, @@ -26,7 +27,6 @@ import {logger} from '../services/Logger'; import {encryptUserId} from '../services/MaskUserId'; import styles from './styles'; import {defaultConfig} from './constants'; -import {Picker} from '@react-native-community/picker'; import WmConfig from 'react-native-wm-config'; export const ErrorScreen: FC<any> = (props) => { @@ -44,7 +44,7 @@ export const ErrorScreen: FC<any> = (props) => { defaultConfig.issues, ); const [otherErrorFb, setOtherErrorFb] = useState(defaultConfig.otherIssues); - const [selectedOther, setSelectedOther] = useState([]); + const [selectedOther, setSelectedOther] = useState({}); const userIdValid = !formDirty || !!userId; const siteIdValid = !formDirty || !!siteId; @@ -91,6 +91,10 @@ export const ErrorScreen: FC<any> = (props) => { } }; + const getOptions2 = (list: Array<string>) => { + return list.map((opn) => opn[i18n.language]); + }; + const getOptions = (list: Array<string>) => { return list.map((opn, index) => ({ id: index, @@ -168,33 +172,15 @@ export const ErrorScreen: FC<any> = (props) => { styles.userIdInput, !errSelectValid && styles.errorBorder, ]}> - <Picker - testID='pickerTest' - selectedValue={errorCategory} - style={!errorCategory && styles.placeholder} - onValueChange={(itemValue, index) => { - index === 0 - ? setErrorCategory('') - : setErrorCategory(itemValue); - }}> - <Picker.Item - key={'0'} - testID={'pickerItem'} - label={translate('ssoError.selectIssue')} - value={''} - /> - {errorCategoriesFb.map((err, index) => { - const errTranslate = translate(err[i18n.language]); - return ( - <Picker.Item - key={index} - testID={'pickerItem' + index} - label={errTranslate} - value={errTranslate} - /> - ); - })} - </Picker> + <Dropdown + placeholder={translate('ssoError.selectIssue')} + value={errorCategory} + values={getOptions2(errorCategoriesFb)} + onSelect={(value) => { + setErrorCategory(value); + }} + style={styles.innerElement} + /> </View> {missingFields && formDirty && (
replace picker with dropdown
replace picker with dropdown
29f93746ee9188a825fa05161a1d6bb6b78476bd
--- app.config.US.ts @@ -32,6 +32,7 @@ const CONFIG: ExpoConfig = { name: "MyWalmart", slug: "myWalmart", version: pkg.version, + platforms: ["ios", "android"], android: { icon: AppVariant.select({ prod: `${__dirname}/assets/images/icon.png`, @@ -150,7 +151,6 @@ const CONFIG: ExpoConfig = { supportsTablet: true, }, orientation: "portrait", - platforms: ["ios", "android"], plugins: [ "@config-plugins/react-native-blob-util", "@config-plugins/react-native-pdf",
chore: dummy change commit to trigger looper template fix
chore: dummy change commit to trigger looper template fix
be1d4546e357d455ba625906cd6205df1b5f813b
--- __tests__/managerExperience/screens/RosterDetailScreen.test.tsx @@ -104,6 +104,9 @@ describe('RosterDetailScreen', () => { beforeEach(() => { jest.spyOn(hooks, 'useGetViewersPrimaryTeamId').mockReturnValue('1000333'); jest.spyOn(hooks, 'useRbacConfigWithJobCode').mockReturnValue(true); + jest + .spyOn(hooks, 'useTotalSiteOrTotalStore') + .mockReturnValue('Total store'); jest.spyOn(hooks, 'useDailyRoster').mockReturnValue( // @ts-ignore {
feat: added mock hook
feat: added mock hook
1f8f5557ab80f7ee61efce07bd51bb2e13e75cab
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.15.24", + "version": "1.15.25", "main": "dist/index.js", "files": [ "dist" @@ -99,7 +99,7 @@ "@walmart/react-native-shared-navigation": "6.1.4", "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "3.7.0", - "@walmart/roster-mini-app": "2.12.25", + "@walmart/roster-mini-app": "2.12.26", "@walmart/ui-components": "1.15.1", "babel-jest": "^29.2.1", "chance": "^1.1.11", --- yarn.lock @@ -6497,7 +6497,7 @@ __metadata: "@walmart/react-native-shared-navigation": "npm:6.1.4" "@walmart/react-native-sumo-sdk": "npm:2.6.0" "@walmart/redux-store": "npm:3.7.0" - "@walmart/roster-mini-app": "npm:2.12.25" + "@walmart/roster-mini-app": "npm:2.12.26" "@walmart/ui-components": "npm:1.15.1" babel-jest: "npm:^29.2.1" chance: "npm:^1.1.11" @@ -6678,9 +6678,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:2.12.25": - version: 2.12.25 - resolution: "@walmart/roster-mini-app@npm:2.12.25" +"@walmart/roster-mini-app@npm:2.12.26": + version: 2.12.26 + resolution: "@walmart/roster-mini-app@npm:2.12.26" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6722,7 +6722,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/867f906413bbe68bbd44854931625996fbf9264544c2a8d80378002bbb7ec81ceb689f6555ef51a9c2e00647a1a0738d567e0cce595ec4e71add242cdf8e9ca1 + checksum: 10c0/a89392f68cb8a12c0740bd61021b5b081f0722a538531b8296e21a52d1f2ddeeb3d64719781554463ea447ab1b2022f89283b51fc5a490267f21034189b592e5 languageName: node linkType: hard
Update my team mini app version
Update my team mini app version
cc3633e803ce197d617aa3b6e2f2d729145440a3
--- package-lock.json @@ -42,7 +42,7 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.18.5", "@walmart/attendance-mini-app": "3.10.0", - "@walmart/avp-feature-app": "0.0.34", + "@walmart/avp-feature-app": "0.0.35", "@walmart/avp-shared-library": "0.0.54", "@walmart/calling-mini-app": "0.1.8", "@walmart/compass-sdk-rn": "5.18.15", @@ -8555,9 +8555,9 @@ } }, "node_modules/@walmart/avp-feature-app": { - "version": "0.0.34", - "resolved": "https://npme.walmart.com/@walmart/avp-feature-app/-/avp-feature-app-0.0.34.tgz", - "integrity": "sha512-6p4RQ/3eOodVp+Os3ap3z4pb7OcxAK7XKUrsxC6UuygMaZRcDfS0BkXHVls3p8NB2yBD6ww0L9IcfG6FAbb8MQ==", + "version": "0.0.35", + "resolved": "https://npme.walmart.com/@walmart/avp-feature-app/-/avp-feature-app-0.0.35.tgz", + "integrity": "sha512-GOds3VjKy+UWsgljwrYKAiPg9Dp2Qao+bkbNfqExZcZ27vwaPXgeLyGxiXEpE9YyR+UCUeMhy7PJzkqh1zN0PA==", "hasInstallScript": true, "engines": { "node": ">=16" @@ -33248,9 +33248,9 @@ } }, "@walmart/avp-feature-app": { - "version": "0.0.34", - "resolved": "https://npme.walmart.com/@walmart/avp-feature-app/-/avp-feature-app-0.0.34.tgz", - "integrity": "sha512-6p4RQ/3eOodVp+Os3ap3z4pb7OcxAK7XKUrsxC6UuygMaZRcDfS0BkXHVls3p8NB2yBD6ww0L9IcfG6FAbb8MQ==" + "version": "0.0.35", + "resolved": "https://npme.walmart.com/@walmart/avp-feature-app/-/avp-feature-app-0.0.35.tgz", + "integrity": "sha512-GOds3VjKy+UWsgljwrYKAiPg9Dp2Qao+bkbNfqExZcZ27vwaPXgeLyGxiXEpE9YyR+UCUeMhy7PJzkqh1zN0PA==" }, "@walmart/avp-shared-library": { "version": "0.0.54", --- package.json @@ -83,7 +83,7 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.18.5", "@walmart/attendance-mini-app": "3.10.0", - "@walmart/avp-feature-app": "0.0.34", + "@walmart/avp-feature-app": "0.0.35", "@walmart/avp-shared-library": "0.0.54", "@walmart/calling-mini-app": "0.1.8", "@walmart/compass-sdk-rn": "5.18.15",
bumped avp version
bumped avp version
3328708a0a420881776e470bd99129bec76a4832
--- package-lock.json @@ -2059,9 +2059,9 @@ } }, "@walmart/settings-mini-app": { - "version": "1.1.7", - "resolved": "https://npme.walmart.com/@walmart/settings-mini-app/-/settings-mini-app-1.1.7.tgz", - "integrity": "sha512-IwbTV54rfPz6UUcw2blm3TiaGb/CUAqpape+wb6I65L69U59h747TLJCySX0pw3bfuX/X4KczT9w7qX5yhjdBA==" + "version": "1.1.8", + "resolved": "https://npme.walmart.com/@walmart/settings-mini-app/-/settings-mini-app-1.1.8.tgz", + "integrity": "sha512-eDS3eLxVfwTsUICU89ERbzln7RdE53bKTfT5gwYg7wn+bo7U/VtRNX5A12r1Et8nRITkwfGh9ZZS05frCO1TYQ==" }, "@walmart/time-clock-mini-app": { "version": "0.0.21", --- package.json @@ -57,7 +57,7 @@ "@walmart/react-native-shared-navigation": "^0.2.0", "@walmart/redux-store": "^1.0.7", "@walmart/schedule-mini-app": "0.2.27", - "@walmart/settings-mini-app": "1.1.7", + "@walmart/settings-mini-app": "1.1.8", "@walmart/time-clock-mini-app": "0.0.21", "@walmart/ui-components": "^1.0.77", "i18next": "^19.7.0", --- src/core/versionsInit.ts @@ -16,6 +16,7 @@ const miniApps = [ '@walmart/time-clock-mini-app', '@walmart/feedback-all-spark-miniapp', '@walmart/settings-mini-app', + '@walmart/inbox-mini-app', ]; export async function initAppVersions() { --- src/translations/en-US.ts @@ -10,6 +10,7 @@ export const enUS = { '@walmart/time-clock-mini-app': 'Time Clock', '@walmart/settings-mini-app': 'Settings', '@walmart/feedback-all-spark-miniapp': 'Feedback', + '@walmart/inbox-mini-app': 'Inbox', }, navigation: { main: 'Me@Walmart', --- src/translations/es-MX.ts @@ -10,6 +10,7 @@ export const esMX = { '@walmart/time-clock-mini-app': 'Time Clock', '@walmart/settings-mini-app': 'Settings', '@walmart/feedback-all-spark-miniapp': 'Feedback', + '@walmart/inbox-mini-app': 'Inbox', }, navigation: { main: 'Me@Walmart',
setting version bump, inbox in versions (#180)
setting version bump, inbox in versions (#180) Co-authored-by: Anthony Helms <awhelms@wal-mart.com> Co-authored-by: Lochy <Hy.Loc@walmartlabs.com>
88bd9fd2b1d7d69eb8327eed1acb82f2e2572408
--- __tests__/services/config.test.ts @@ -83,7 +83,7 @@ describe('getGraphQLConfig', () => { expect(getGraphQLConfig(envConfig)).toEqual(expectedConfig); }); - it('should return the correct config when miniAppPackage.version is not defined', () => { + it('should return the correct config when miniAppPackage.version is not defined properly', () => { //@ts-ignore jest.replaceProperty(miniAppPackage, 'version', undefined); const envConfig = {env: 'dev'} as unknown as EnvConfig; --- __tests__/setup.ts @@ -53,18 +53,13 @@ jest.mock('@walmart/roster-mini-app', () => jest.mock('expo-image', () => jest.requireActual('expo-image')); -jest.mock( - '@walmart/allspark-foundation-hub/AllsparkHubContainer', - () => ({ - ...jest.doMock( - '@walmart/allspark-foundation-hub/AllsparkHubContainer', - ), - AllsparkHubContainer: jest.fn().mockImplementationOnce(() => ({ - create: jest.fn().mockImplementationOnce(() => ({ - validate: jest.fn().mockImplementationOnce(() => ({ - render: jest.fn().mockImplementationOnce(() => {}), - })), +jest.mock('@walmart/allspark-foundation-hub', () => ({ + ...jest.doMock('@walmart/allspark-foundation-hub'), + AllsparkHubContainer: jest.fn().mockImplementationOnce(() => ({ + create: jest.fn().mockImplementationOnce(() => ({ + validate: jest.fn().mockImplementationOnce(() => ({ + render: jest.fn().mockImplementationOnce(() => {}), })), })), - }), -); + })), +})); --- src/navigation/index.tsx @@ -1,8 +1,8 @@ import React from 'react'; import {SafeAreaProvider} from 'react-native-safe-area-context'; import {initializeWidgets} from './utils'; -import {AllsparkHubContainer} from '@walmart/allspark-foundation-hub/AllsparkHubContainer'; import { + AllsparkHubContainer, TEAM_HUB_CCM_NAMESPACE, TEAM_HUB_KEY, TEAM_HUB_SCREEN_NAME,
Update the myteam mini app version
Update the myteam mini app version
24c9beea67bced63a6405fe96b17f501f015809b
--- docs/CHANGELOG.md @@ -1,3 +1,10 @@ +## [2.26.2](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/compare/v2.26.1...v2.26.2) (2025-04-30) + + +### Bug Fixes + +* SMDV-9999 update build script and looper ([711bde2](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/commit/711bde2073f8d7dbd8fd9b48eba31cb6b1bd6fbf)) + ## [2.26.1](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/compare/v2.26.0...v2.26.1) (2025-04-30) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/wmconnect-mini-app", - "version": "2.26.1", + "version": "2.26.2", "main": "index.ts", "workspaces": [ "packages/*" @@ -8,7 +8,7 @@ "installConfig": { "hoistingLimits": "none" }, - "packageManager": "yarn@4.4.0", + "packageManager": "yarn@4.6.0", "engines": { "node": ">=18" },
chore(release): 2.26.2 [skip ci]
chore(release): 2.26.2 [skip ci] ## [2.26.2](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/compare/v2.26.1...v2.26.2) (2025-04-30) ### Bug Fixes * SMDV-9999 update build script and looper ([711bde2](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/commit/711bde2073f8d7dbd8fd9b48eba31cb6b1bd6fbf))
816c551a0d43c791a47116169f2378a13da9f397
--- package-lock.json @@ -4530,9 +4530,9 @@ } }, "@walmart/ui-components": { - "version": "1.3.0-rc.10", - "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.3.0-rc.10.tgz", - "integrity": "sha512-sT/r0z6PafgvIzi3IUnAxpJtGPjFgNdRnew/bLGGVr+1GdoGggf+/lSlB31qaXNkh9ue/iObdE5lin5jXSceIA==", + "version": "1.3.0-rc.11", + "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.3.0-rc.11.tgz", + "integrity": "sha512-8/KgDYiuTC9JhJPBzFjem8Ocovaqe0vNMN/okkhUgBCiAimUMixQNsCChwsrE1IRfOT5+1hvSJeunZXy/fCIcw==", "requires": { "react-native-calendars": "1.299.0" } --- package.json @@ -103,7 +103,7 @@ "@walmart/shelfavailability-mini-app": "0.8.3", "@walmart/taskit-mini-app": "0.199.0-rc.0", "@walmart/time-clock-mini-app": "0.4.27", - "@walmart/ui-components": "1.3.0-rc.10", + "@walmart/ui-components": "1.3.0-rc.11", "@walmart/welcomeme-mini-app": "0.44.0", "@walmart/wfm-ui": "0.2.11", "axios-cache-adapter": "2.7.3",
version bump ui-component
version bump ui-component
d1eecf632d31158238537361af97468af18f0037
--- package-lock.json @@ -4258,9 +4258,9 @@ "integrity": "sha512-rsHtoIJTGpR2zLro+B2r94psuK7G83J0XsUoerXiTAhRNDK/Si+oQiGI+xliq7bKRatUlbl6FrzblsILjofyGw==" }, "@walmart/inbox-mini-app": { - "version": "0.26.0-beta.3", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.26.0-beta.3.tgz", - "integrity": "sha512-/urZ3i+B0MrnJzmxpwOW14e9BZssuYzjfW3Y1nRJ1niRCewCSmd1sgIkQHHieXtmvLMnEck0zDOdDoBeZxCBkQ==" + "version": "0.26.0-beta.4", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.26.0-beta.4.tgz", + "integrity": "sha512-SUWy8/z8lqga08l8UETiPzARnypabFTNLQo6WvUQVGEsSb+pqvgmRLNbbpgCZwG0qU6myr+bWYavGZznRfSyAA==" }, "@walmart/iteminfo-mini-app": { "version": "4.0.15", --- package.json @@ -84,7 +84,7 @@ "@walmart/gtp-shared-components": "1.2.0", "@walmart/impersonation-mini-app": "1.0.27", "@walmart/ims-print-services-ui": "0.1.16", - "@walmart/inbox-mini-app": "0.26.0-beta.3", + "@walmart/inbox-mini-app": "0.26.0-beta.4", "@walmart/iteminfo-mini-app": "4.0.15", "@walmart/manager-approvals-miniapp": "0.0.59", "@walmart/metrics-mini-app": "0.5.21",
update version to beta-4
update version to beta-4
1ba9a7651f3c2c8e98ce1ce9a0bcfcbe85d81759
--- android/app/src/main/java/com/walmart/stores/allspark/beta/IntentWakeupReceiver.kt @@ -6,7 +6,6 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.util.Log -import com.walmart.stores.allspark.beta.BuildConfig; class IntentWakeupReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) {
removing import in intent as well
removing import in intent as well
1577414952bb64998102bdf262860b9ea979a162
--- __tests__/auth/ErrorScreenTest.tsx @@ -161,6 +161,65 @@ describe('ErrorScreen', () => { dismissText: 'welcome.gotIt', }); }); + it('handles save on button press with errorCategory as Other', () => { + (useTranslation as jest.Mock).mockReturnValueOnce([ + (translate) => { + const t = {'ssoError.other': 'Other'}; + return t[translate] || translate; + }, + {language: 'en-US'}, + ]); + mockUseState.mockReturnValueOnce(['swalton3', setUserId]); + mockUseState.mockReturnValueOnce(['1234', setSiteId]); + mockUseState.mockReturnValueOnce(['', setDetail]); + mockUseState.mockReturnValueOnce([true, setFormDirty]); + mockUseState.mockReturnValueOnce([ + defaultConfig.issues[9], + setErrorCategory, + ]); + mockUseState.mockReturnValueOnce([ + defaultConfig.issues, + setErrorCategoriesFb, + ]); + mockUseState.mockReturnValueOnce([ + defaultConfig.otherIssues, + setOtherErrorFb, + ]); + mockUseState.mockReturnValueOnce([ + {'Do any of these apply?': [1, 2]}, + setSelectedOther, + ]); + mockUseState.mockReturnValueOnce([{}, setFormatedOther]); + mockUseState.mockReturnValueOnce([{}, setDeviceType]); + component.update(<ErrorScreen navigation={mockNavigation} />); + + let interactionTask: any; + const interactionSpy = jest + .spyOn(InteractionManager, 'runAfterInteractions') + //@ts-ignore + .mockImplementation(jest.fn((task) => (interactionTask = task))); + + const SubmitButton = component.root.findByType(PrimaryButton); + SubmitButton.props.onPress(); + expect(setFormDirty).toHaveBeenCalledWith(true); + expect(mockNavigation.goBack).toHaveBeenCalled(); + expect(logger.error).toHaveBeenCalledWith('SSO error while Login', { + message: 'no details entered by the user', + userId: 'Encrypted-SWALTON3-1234', + siteId: '1234', + errorCategory: 'Other', + code: 'SSO109', + devicetype: {}, + options: [], + }); + expect(interactionSpy).toHaveBeenCalled(); + + interactionTask(); + expect(mockNavigation.navigate).toHaveBeenCalledWith('Core.Toast', { + message: 'welcome.errorRegisteredText', + dismissText: 'welcome.gotIt', + }); + }); it('handles save with no detail', () => { (useTranslation as jest.Mock).mockReturnValueOnce([ @@ -330,4 +389,29 @@ describe('ErrorScreen', () => { expect(component.toJSON()).toMatchSnapshot(); }); + it('when errorCategoriesFb to be null, set initialConfig', () => { + Platform.OS = 'ios'; + mockUseState.mockReturnValueOnce(['swalton3', setUserId]); + mockUseState.mockReturnValueOnce(['1234', setSiteId]); + mockUseState.mockReturnValueOnce(['N/A', setDetail]); + mockUseState.mockReturnValueOnce([true, setFormDirty]); + mockUseState.mockReturnValueOnce(['', setErrorCategory]); + mockUseState.mockReturnValueOnce([ + defaultConfig.issues, + setErrorCategoriesFb, + ]); + mockUseState.mockReturnValueOnce([ + defaultConfig.otherIssues, + setOtherErrorFb, + ]); + mockUseState.mockReturnValueOnce([{}, setSelectedOther]); + mockUseState.mockReturnValueOnce([{}, setFormatedOther]); + mockUseState.mockReturnValueOnce([{}, setDeviceType]); + component.update(<ErrorScreen navigation={mockNavigation} />); + + const dropdown = component.root.findByType(Dropdown); + dropdown.props.onSelect('hello'); + const param = {code: '', 'en-US': '', 'es-MX': ''}; + expect(setErrorCategory).toHaveBeenCalledWith(param); + }); }); --- __tests__/auth/__snapshots__/ErrorScreenTest.tsx.snap @@ -202,15 +202,16 @@ exports[`ErrorScreen matches snapshot when dirty and no userId/siteId 1`] = ` "marginLeft": 17, } } - value="" values={ Array [ "Clock-in/clock-out issue", - "2-step verification failure", "Store transfer issue", "New phone or new number", "Didn't receive text verification", + "Didn't receive call", "Can't receive push notifications", + "Asked to visit wmlink/2step to register", + "Unable to login using password", "Store Wi-Fi issue", "Other", ] @@ -531,15 +532,16 @@ exports[`ErrorScreen renders default 1`] = ` "marginLeft": 17, } } - value="" values={ Array [ "Problema de registro de entrada/salida", - "Fallo de verificación de 2 pasos", "Problema de transferencia de tienda", "Nuevo teléfono o nuevo número", "No recibí la verificación por mensaje de texto ", + "no recibi llamada", "No puedo recibir push notifications", + "Asked to visit wmlink/2step to register", + "Unable to login using password", "Problema con el Wi-Fi de la tienda", "Otro", ]
test case update
test case update
158f28a67562a590aacacafb5776b525e71724b3
--- package.json @@ -1,7 +1,7 @@ { "name": "@walmart/myteam-mini-app", "version": "1.34.1", - "main": "main.js", + "main": "dist/index.js", "files": [ "dist", "main.js"
feat(ui): update package
feat(ui): update package
1b4fc3f74d7bd0d9d1fafc1fa8630c5423c86cf9
--- docs/CHANGELOG.md @@ -1,3 +1,10 @@ +# [1.5.0](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.4.0...v1.5.0) (2024-06-26) + + +### Features + +* **ui:** Mini app changes for drop 23 SMDV-5921 ([43376dc](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/43376dcbd4ea4c59848ab1c79a993945dee98d81)) + # [1.4.0](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.3.1...v1.4.0) (2024-06-17) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.4.0", + "version": "1.5.0", "main": "dist/index.js", "files": [ "dist"
chore(release): 1.5.0 [skip ci]
chore(release): 1.5.0 [skip ci] # [1.5.0](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.4.0...v1.5.0) (2024-06-26) ### Features * **ui:** Mini app changes for drop 23 SMDV-5921 ([43376dc](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/43376dcbd4ea4c59848ab1c79a993945dee98d81))
7c866492a668d2728fb6f49918a6eddfdc33cf1c
--- ios/Podfile.lock @@ -541,7 +541,7 @@ PODS: - RCTTypeSafety - React - ReactCommon/turbomodule/core - - react-native-scanner-3.0 (0.1.26): + - react-native-scanner-3.0 (0.1.27): - Firebase/Analytics - React - ScanditBarcodeCapture (= 6.14.0)
Update Scanner3 pod
Update Scanner3 pod
3acec250266cf0275f32050fed2d18b050a30805
--- package-lock.json @@ -1941,6 +1941,11 @@ "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.0.23.tgz", "integrity": "sha512-AAEq+Lh1weT7sqEuQx9JcMHVH3J07Zms3SmpPdCUhT/44ZY56cf+PTKyVn5TZ5XuFWbumhInXX0Bq3KKeKhkgw==" }, + "@walmart/react-native-env": { + "version": "0.1.0", + "resolved": "https://npme.walmart.com/@walmart/react-native-env/-/react-native-env-0.1.0.tgz", + "integrity": "sha512-ooH0AqLGhS5PNcLaOWRHAEIIvrYIyTUXqshlHkgEKDLhLtGW8WvFu0mlcCXb1FEUc/PVmKEzHNHYV1gzGNBqxQ==" + }, "@walmart/react-native-logger": { "version": "1.14.0", "resolved": "https://npme.walmart.com/@walmart/react-native-logger/-/react-native-logger-1.14.0.tgz", --- package.json @@ -45,6 +45,7 @@ "@walmart/gtp-shared-components": "^0.2.2", "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.0.23", + "@walmart/react-native-env": "^0.1.0", "@walmart/react-native-logger": "^1.14.0", "@walmart/react-native-shared-navigation": "^0.2.0", "@walmart/redux-store": "^1.0.7", --- src/core/envInit.ts @@ -1,4 +1,5 @@ import {reducerManager} from '@walmart/redux-store'; +import {setSharedConfig, SharedConfig} from '@walmart/react-native-env'; import Config from '../../env'; const initialState = { @@ -6,6 +7,11 @@ const initialState = { consumerId: Config.consumerId, }; +setSharedConfig({ + env: Config.env, + appConsumerId: Config.consumerId, +} as SharedConfig); + const envReducer = (state: any = initialState) => state; reducerManager.addReducer('envConfig', envReducer);
setting env for mini apps to use (#112)
setting env for mini apps to use (#112)
8a7bc1ec0a9450d20e53591f380c75196ff17aab
--- targets/US/package.json @@ -142,7 +142,7 @@ "@walmart/rfid-scan-mini-app": "2.4.4", "@walmart/rn-receiving-mini-app": "2.3.211", "@walmart/roster-mini-app": "2.9.0", - "@walmart/schedule-mini-app": "0.118.2", + "@walmart/schedule-mini-app": "1.10.0", "@walmart/shelfavailability-mini-app": "1.5.37", "@walmart/shop-gnfr-mini-app": "1.0.137", "@walmart/sidekick-mini-app": "4.84.9", @@ -355,4 +355,4 @@ ] } } -} \ No newline at end of file +} --- yarn.lock @@ -4698,6 +4698,26 @@ __metadata: languageName: node linkType: hard +"@reduxjs/toolkit@npm:^2.2.8": + version: 2.4.0 + resolution: "@reduxjs/toolkit@npm:2.4.0" + dependencies: + immer: "npm:^10.0.3" + redux: "npm:^5.0.1" + redux-thunk: "npm:^3.1.0" + reselect: "npm:^5.1.0" + peerDependencies: + react: ^16.9.0 || ^17.0.0 || ^18 + react-redux: ^7.2.1 || ^8.1.3 || ^9.0.0 + peerDependenciesMeta: + react: + optional: true + react-redux: + optional: true + checksum: 10c0/8752f18ded06727386662e2b6ea626008c5eb79630bd67ed911b7958375d25882cf2c8703f10e9c56df12c0b4123eb495aead10b0e31072196478221a9f92a74 + languageName: node + linkType: hard + "@repeaterjs/repeater@npm:^3.0.4": version: 3.0.5 resolution: "@repeaterjs/repeater@npm:3.0.5" @@ -7058,7 +7078,7 @@ __metadata: "@walmart/rfid-scan-mini-app": "npm:2.4.4" "@walmart/rn-receiving-mini-app": "npm:2.3.211" "@walmart/roster-mini-app": "npm:2.9.0" - "@walmart/schedule-mini-app": "npm:0.118.2" + "@walmart/schedule-mini-app": "npm:1.10.0" "@walmart/shelfavailability-mini-app": "npm:1.5.37" "@walmart/shop-gnfr-mini-app": "npm:1.0.137" "@walmart/sidekick-mini-app": "npm:4.84.9" @@ -7846,22 +7866,24 @@ __metadata: languageName: node linkType: hard -"@walmart/schedule-mini-app@npm:0.118.2": - version: 0.118.2 - resolution: "@walmart/schedule-mini-app@npm:0.118.2" +"@walmart/schedule-mini-app@npm:1.10.0, @walmart/schedule-mini-app@npm:>=0.120.0": + version: 1.10.0 + resolution: "@walmart/schedule-mini-app@npm:1.10.0" dependencies: + "@reduxjs/toolkit": "npm:^2.2.8" "@walmart/moment-walmart": "npm:^1.0.4" - "@walmart/wfm-ui": "npm:1.6.0" - wfm-allspark-data-library: "npm:3.3.0" + "@walmart/wfm-ui": "npm:^2.4.0" + wfm-allspark-data-library: "npm:5.1.0" peerDependencies: "@react-native-community/datetimepicker": ^7.6.2 "@react-native-firebase/remote-config": ">=10.1.1" "@react-navigation/elements": ">=1.3.1" "@react-navigation/native": ">=6.0.0" "@react-navigation/stack": ">=6.0.0" + "@walmart/allspark-foundation": ">=6.17.0" "@walmart/allspark-http-client": ">=2.4.17" "@walmart/attendance-mini-app": ">=3.24.3" - "@walmart/core-services": ">=2.0.19" + "@walmart/core-services": ^6.0.0 "@walmart/gtp-shared-components": ">=0.2.2" "@walmart/react-native-shared-navigation": ">=0.2.0" "@walmart/redux-store": ">=1.0.15" @@ -7877,7 +7899,7 @@ __metadata: react-redux: ">=7.2.1" redux: ">=4.0.5" reselect: ">=4.0.0" - checksum: 10c0/455fe9f873347e6b77ef1ba38f9788ffba21e5bfb00979b3f8bdb1992ccdb617f565ed63a4ba9d9c37af1059f321630837fb6e3e7bd8a035b92e999ea958d950 + checksum: 10c0/2eb26c7e0eb3a2ce43c679617d8f7e32b04e033c3ffcfdd5a7fafbf177c9c92376c3d87adbc9beac21d89375955f6df9667d3f48059813a97c091d4ce7f5b7fd languageName: node linkType: hard @@ -8219,6 +8241,24 @@ __metadata: languageName: node linkType: hard +"@walmart/wfm-ui@npm:^2.4.0": + version: 2.4.0 + resolution: "@walmart/wfm-ui@npm:2.4.0" + dependencies: + "@walmart/moment-walmart": "npm:1.0.3" + string.prototype.matchall: "npm:>=4.0.2" + peerDependencies: + "@walmart/allspark-foundation": ">=6.1.4" + moment: ">=2.29.4" + react: ">=18.2.0" + react-native: ">=0.72.6" + react-native-modal: ">=11.5.6" + react-native-vector-icons: ">=7.0.0" + xdate: ">=0.8.0" + checksum: 10c0/4b374f541629d79880e33aea8374365e3eceeec3063a6fcb51e83d83a4c7c3ba67cc5894c66ccf1a1e567ab0920857f0106b9049721e01496a84803431117bd8 + languageName: node + linkType: hard + "@walmart/wm-plus-mini-app@npm:1.0.0": version: 1.0.0 resolution: "@walmart/wm-plus-mini-app@npm:1.0.0" @@ -13636,6 +13676,13 @@ __metadata: languageName: node linkType: hard +"immer@npm:^10.0.3": + version: 10.1.1 + resolution: "immer@npm:10.1.1" + checksum: 10c0/b749e10d137ccae91788f41bd57e9387f32ea6d6ea8fd7eb47b23fd7766681575efc7f86ceef7fe24c3bc9d61e38ff5d2f49c2663b2b0c056e280a4510923653 + languageName: node + linkType: hard + "immer@npm:^9.0.21": version: 9.0.21 resolution: "immer@npm:9.0.21" @@ -22716,22 +22763,19 @@ __metadata: languageName: node linkType: hard -"wfm-allspark-data-library@npm:3.3.0": - version: 3.3.0 - resolution: "wfm-allspark-data-library@npm:3.3.0" +"wfm-allspark-data-library@npm:5.1.0": + version: 5.1.0 + resolution: "wfm-allspark-data-library@npm:5.1.0" dependencies: - azure-storage: "npm:2.10.3" - url: "npm:^0.11.0" + "@walmart/schedule-mini-app": "npm:>=0.120.0" peerDependencies: - "@walmart/core-services": ">=2.1.1" - "@walmart/redux-store": ">=3.4.0" - crypto-js: ^4.2.0 - i18next: "*" - moment: ^2.29.4 + "@walmart/allspark-foundation": "*" + azure-storage: 2.10.3 + moment: ">=2.29.4" react: ">=18.1.0" - react-native: ">=0.70.5" - redux: ">=4.1.0" - checksum: 10c0/51f3236d4cd88112795f8857030f9e5dde6f75b2bdde2664fdb43dad6a72f84b7edf040220bf4b090bef5ea456e381c762d82614511b323f1791159528943a91 + react-native: ">=0.72.6" + url: ^0.11.0 + checksum: 10c0/33db8012c2f38b22aeeeb16e520d00a6f5ab352169e1231f42a7395a12160f71b5308c3a74db7a648e87300c3aea9f7fa4a8f4ae4fafedfb3e8af1ab0f7d6e01 languageName: node linkType: hard
bumping schedule mini app for drop 27
bumping schedule mini app for drop 27
614d21c87fb50fedcca73311ae6142648ea49aa2
--- src/ccmFallbacks.ts @@ -6,5 +6,5 @@ export const CCMFallbacks = { pushToTalkEnabled: false, shouldDisplayWarningBanner: false, warningMessageContent: - 'Look for changes to Me@ in August. The texting feature will be improved and push to talk will be removed temporarily for updates.', + 'We’ve improved text and voice messaging. Update now to the latest version of the Me@Walmart app to continue using these features.', }; --- src/containers/WarningBanner.tsx @@ -1,8 +1,6 @@ import React, {useState} from 'react'; import {Text} from 'react-native'; import {Banner} from '@walmart/gtp-shared-components'; -import {TEXTING_I18N_NAMESPACE} from '../translations'; -import {useTranslation} from 'react-i18next'; import {useSelector} from 'react-redux'; import { shouldDisplayWarningBanner, @@ -10,14 +8,13 @@ import { } from '../redux/selectors'; export const WarningBanner = () => { - const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); const [dismissBanner, setDismissBanner] = useState(false); const showWarningBanner = useSelector(shouldDisplayWarningBanner); const messageContent = useSelector(warningMessageContent); const onDismissBanner = () => setDismissBanner(true); return showWarningBanner && !dismissBanner ? ( <Banner variant='warning' onClose={onDismissBanner}> - <Text>{t(messageContent.toString() || '')}</Text> + <Text>{messageContent.toString()}</Text> </Banner> ) : ( <></> --- src/ccmFallbacks.ts @@ -6,5 +6,5 @@ export const CCMFallbacks = { pushToTalkEnabled: false, shouldDisplayWarningBanner: false, warningMessageContent: - 'Look for changes to Me@ in August. The texting feature will be improved and push to talk will be removed temporarily for updates.', + 'We’ve improved text and voice messaging. Update now to the latest version of the Me@Walmart app to continue using these features.', }; --- src/containers/WarningBanner.tsx @@ -1,8 +1,6 @@ import React, {useState} from 'react'; import {Text} from 'react-native'; import {Banner} from '@walmart/gtp-shared-components'; -import {TEXTING_I18N_NAMESPACE} from '../translations'; -import {useTranslation} from 'react-i18next'; import {useSelector} from 'react-redux'; import { shouldDisplayWarningBanner, @@ -10,14 +8,13 @@ import { } from '../redux/selectors'; export const WarningBanner = () => { - const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); const [dismissBanner, setDismissBanner] = useState(false); const showWarningBanner = useSelector(shouldDisplayWarningBanner); const messageContent = useSelector(warningMessageContent); const onDismissBanner = () => setDismissBanner(true); return showWarningBanner && !dismissBanner ? ( <Banner variant='warning' onClose={onDismissBanner}> - <Text>{t(messageContent.toString() || '')}</Text> + <Text>{messageContent.toString()}</Text> </Banner> ) : ( <></>
update the warning message
update the warning message
09ac8cf813b28f69e6bdb16151c3fdc8c9eef47c
--- package-lock.json @@ -3024,9 +3024,9 @@ } }, "@walmart/allspark-me-mini-app": { - "version": "0.0.23", - "resolved": "https://npme.walmart.com/@walmart/allspark-me-mini-app/-/allspark-me-mini-app-0.0.23.tgz", - "integrity": "sha512-BWDKXQKa96w8XujBQyPujxpYHYuUvgXl8a3WO8AH886Ns69pYM0MB1oayqIanwnJB9U5Sw4EbO6PJGdfEVv7eA==", + "version": "0.1.0", + "resolved": "https://npme.walmart.com/@walmart/allspark-me-mini-app/-/allspark-me-mini-app-0.1.0.tgz", + "integrity": "sha512-psSWv1Nf5FL6hZDUVDyNIP3Dd9V2fIZOi0wxGpVsm03aw4I7YrKy4zi2Y3MMuGPM4si9OQZZ8voIYNeaAfRSzQ==", "requires": { "reselect": "^4.0.0" } @@ -12173,6 +12173,11 @@ "jsbarcode": "^3.8.0" } }, + "react-native-biometrics": { + "version": "2.1.4", + "resolved": "https://npme.walmart.com/react-native-biometrics/-/react-native-biometrics-2.1.4.tgz", + "integrity": "sha512-Ek7NmzgHB4rot2DdzV9Q3pzxFjnEFipGSFsmWZw5vcM9vkMoebhz8d8UYgsp0efroyeLITDNHwcFGEzq8XW9Kg==" + }, "react-native-calendars": { "version": "1.299.0", "resolved": "https://npme.walmart.com/react-native-calendars/-/react-native-calendars-1.299.0.tgz", --- package.json @@ -64,7 +64,7 @@ "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@walmart/allspark-health-survey-mini-app": "0.0.35", "@walmart/allspark-home-mini-app": "0.4.0", - "@walmart/allspark-me-mini-app": "0.0.23", + "@walmart/allspark-me-mini-app": "0.1.0", "@walmart/ask-sam-mini-app": "0.17.0", "@walmart/config-components": "1.0.21", "@walmart/feedback-all-spark-miniapp": "0.0.48",
unmasking WIN on Me tab (#556)
unmasking WIN on Me tab (#556) Co-authored-by: Hitesh Arora <>
77152d01feb70adf0d0ae886d6d9ae1d77a77bd5
--- src/channels/components/ChannelRow.tsx @@ -117,6 +117,10 @@ export const ChannelRow = (props: ChannelRowProps) => { lastMessage?.createdAt && lastMessage?.createdAt?.seconds > SEVEN_DAYS_AGO_TIMESTAMP?.seconds; + const deletedMessage = t('channelsScreen.deletedMessage', { + deletedBy: lastMessage?.deletedByPreferredName, + }); + const updatedLastMessageTime = shouldDisplayLastMessage ? lastMessageTime : moment().format('hh:mm a'); @@ -184,7 +188,7 @@ export const ChannelRow = (props: ChannelRowProps) => { testID='lastMessage' weight={unread ? '700' : '400'} numberOfLines={1}> - {updatedLastMessage} + {lastMessage?.deleted ? deletedMessage : updatedLastMessage} </Body> </ListItem> </CardContent> --- src/channels/types.ts @@ -25,6 +25,8 @@ export type LocalFirebaseChannel = FirebaseChannel & { export type LastMessage = FirebaseMessage & { id: string; timestamp: string; + deleted?: boolean; + deletedByPreferredName?: string; }; export type NewChannelDetails = Pick< --- src/translations/en-US.ts @@ -88,6 +88,7 @@ export const enUS = { 'You cannot text other associates since you are in impersonation mode', }, noMessagesFound: 'No messages found', + deletedMessage: 'Message was removed by {{deletedBy}}', }, timestamp: { monday: 'Monday', --- src/channels/components/ChannelRow.tsx @@ -117,6 +117,10 @@ export const ChannelRow = (props: ChannelRowProps) => { lastMessage?.createdAt && lastMessage?.createdAt?.seconds > SEVEN_DAYS_AGO_TIMESTAMP?.seconds; + const deletedMessage = t('channelsScreen.deletedMessage', { + deletedBy: lastMessage?.deletedByPreferredName, + }); + const updatedLastMessageTime = shouldDisplayLastMessage ? lastMessageTime : moment().format('hh:mm a'); @@ -184,7 +188,7 @@ export const ChannelRow = (props: ChannelRowProps) => { testID='lastMessage' weight={unread ? '700' : '400'} numberOfLines={1}> - {updatedLastMessage} + {lastMessage?.deleted ? deletedMessage : updatedLastMessage} </Body> </ListItem> </CardContent> --- src/channels/types.ts @@ -25,6 +25,8 @@ export type LocalFirebaseChannel = FirebaseChannel & { export type LastMessage = FirebaseMessage & { id: string; timestamp: string; + deleted?: boolean; + deletedByPreferredName?: string; }; export type NewChannelDetails = Pick< --- src/translations/en-US.ts @@ -88,6 +88,7 @@ export const enUS = { 'You cannot text other associates since you are in impersonation mode', }, noMessagesFound: 'No messages found', + deletedMessage: 'Message was removed by {{deletedBy}}', }, timestamp: { monday: 'Monday',
making changes on channels screen
making changes on channels screen
7e47fb1dd2d9aaa300faf7ec410b05e5c2909de9
--- package-lock.json @@ -235,6 +235,7 @@ "patch-package": "^6.5.0", "prettier": "^3.0.3", "react-native-apollo-devtools-client": "^1.0.4", + "react-native-drop-shadow": "^1.0.0", "react-native-mask-input": "^1.2.3", "react-native-version": "^4.0.0", "react-test-renderer": "18.2.0", @@ -23251,6 +23252,17 @@ "react-native": "*" } }, + "node_modules/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", + "integrity": "sha512-om6oMDDn90ClFa+tEGMsFcACKlea5TO4jYur8PJKRpzfz+SnDIJlddhzp2kbOLpRTe7lleq6Md5QqC3u7RfOow==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "react": "*", + "react-native": "*" + } + }, "node_modules/react-native-elements": { "version": "3.4.2", "hasInstallScript": true, @@ -42315,6 +42327,12 @@ "react-native-device-info": { "version": "10.3.0" }, + "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", + "integrity": "sha512-om6oMDDn90ClFa+tEGMsFcACKlea5TO4jYur8PJKRpzfz+SnDIJlddhzp2kbOLpRTe7lleq6Md5QqC3u7RfOow==", + "dev": true + }, "react-native-elements": { "version": "3.4.2", "requires": { --- package.json @@ -301,6 +301,7 @@ "patch-package": "^6.5.0", "prettier": "^3.0.3", "react-native-apollo-devtools-client": "^1.0.4", + "react-native-drop-shadow": "^1.0.0", "react-native-mask-input": "^1.2.3", "react-native-version": "^4.0.0", "react-test-renderer": "18.2.0",
add react-native-drop-shadow as dependency
add react-native-drop-shadow as dependency
5089fff037f39efb135ff33ac19ceb074005779f
--- .looper.multibranch.yml @@ -51,3 +51,40 @@ flows: # - (name Branch Check, silent) echo "TBD" - call: build-npm - (name Build JS Bundle for ${market}) npm run bundle-js + + build-android: + - node(label = docker-daemon, ws = exclusive): + - dockerAgent(mdc-agent): + - foreachParallelFailsafe($ENV): + - tools(android = ${ANDROID_TOOLS}): + - group("Android Build ${value}"): + - (name Bundle Setup) https_proxy=http://sysproxy.wal-mart.com:8080 http_proxy=http://sysproxy.wal-mart.com:8080 $RUBY_PATH/bundle + - (name Bundle Update) https_proxy=http://sysproxy.wal-mart.com:8080 http_proxy=http://sysproxy.wal-mart.com:8080 $RUBY_PATH/bundle update + - declare(start_time) + - var(start_time): date +%s + - call: app-build-init + - (name Jetifier) npm run jetifier + # - var(GRADLE_BUILD_FLAVOUR = ${value}) + - call: keys-setup + - call: native-common($value) + + build-app: + - try: + - if: | + %{OS == "ios"} + then: + - if: ${SIMULATOR_BUILD} + then: + - (name Create Simulator Build) export PATH="${RUBY_PATH}:${PATH}" && $RUBY_PATH/bundle exec fastlane build_simulator + else: + - (name Build iOS) export PATH="${RUBY_PATH}:${PATH}" && export FASTLANE_DISABLE_COLORS=1 && $RUBY_PATH/bundle exec fastlane build_ipa + - if: ${LOG_PARSER} + then: + - call: log-parser + else: + # - var(GRADLE_BUILD_FLAVOUR = ${ENV}) + - (name Build Android) export FASTLANE_DISABLE_COLORS=1 && $RUBY_PATH/bundle exec fastlane build_android # set GRADLE_BUILD_FLAVOUR as Capitalized Env + catch: + - var(errorMessage = ${flowErrorMessage}) + - call: build-notification(failure) + - fail("${flowErrorMessage}")
chore: override looper flows to skip gradle build flavor
chore: override looper flows to skip gradle build flavor
af56075d17339c2c890d141d657fa486d45aaea3
--- packages/allspark-foundation/__tests__/Components/context.test.tsx @@ -1,8 +1,6 @@ import React from 'react'; import { render } from '@testing-library/react-native'; import { AllsparkComponentProvider, useAllsparkImage } from '../../src/Components/context'; -import { Image , Text} from 'react-native'; -import { useAllsparkComponent } from '../../src/Components/context'; describe('AllsparkComponentContext', () => { it('uses default Image component when not overridden', () => {
code cleanup
code cleanup
fa5697cb042f5e1cc0bc8a1bdb774c47ab99e8e4
--- packages/core-services-allspark/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.13.10](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-services-allspark@2.13.9...@walmart/core-services-allspark@2.13.10) (2024-02-14) + + +### Bug Fixes + +* update cache policy ([8f1bf5c](https://gecgithub01.walmart.com/allspark/allspark-core-services/commit/8f1bf5cc12d2c281d4571a420b61b3504c24ffe0)) + + + + + ## [2.13.9](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-services-allspark@2.13.8...@walmart/core-services-allspark@2.13.9) (2024-02-13) --- packages/core-services-allspark/package-lock.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services-allspark", - "version": "2.13.9", + "version": "2.13.10", "lockfileVersion": 1, "requires": true, "packages": { --- packages/core-services-allspark/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services-allspark", - "version": "2.13.9", + "version": "2.13.10", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts",
chore(version): updating package version
chore(version): updating package version - @walmart/core-services-allspark@2.13.10
3f4eac8e41dc278b0dc681ad1a094e6668bdff4f
--- package-lock.json @@ -4239,7 +4239,7 @@ "@walmart/gtp-shared-components": { "version": "1.2.0", "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-1.2.0.tgz", - "integrity": "sha512-OxDrYdXQeR22V+aTBNqQHRJFyIOlOkp2erG4KS+0lEWWve1EApNHNyPgIbFQbydtWn1rybwFossRsVszkr2XKQ==", + "integrity": "sha1-uZ6zL5R12W20AFyA5eFskWpu0Iw=", "requires": { "@react-native-community/datetimepicker": "^3.0.8", "@react-native-community/picker": "^1.6.5", @@ -4304,12 +4304,12 @@ "@walmart/moment-walmart": { "version": "1.0.4", "resolved": "https://npme.walmart.com/@walmart/moment-walmart/-/moment-walmart-1.0.4.tgz", - "integrity": "sha512-iTkDEL7GeYYS8laso4ECQ7DyHgBxnJh/uP5PJNQMHZyKb8niIwIwb19HFLuGBVRa9vZIjTz7mChSydbIn4KV0w==" + "integrity": "sha1-696avfrTbdFORoktjdt8w3uZ9hw=" }, "@walmart/patient-portal-mobile": { "version": "2.1.14", "resolved": "https://npme.walmart.com/@walmart/patient-portal-mobile/-/patient-portal-mobile-2.1.14.tgz", - "integrity": "sha512-LhqS1Ogr1vi5Nj2/gIRPQnn/ogReKbIhXvXsLdDzltCibI5YGoKxHpReIQKp3YJ01xBUJyUBzrc3G/JCe7KYSg==", + "integrity": "sha1-6a8PZ45o8XUCL3Jj8H7rlEfmefQ=", "requires": { "@react-native-community/datetimepicker": "^3.0.3", "@walmart/react-native-collapsible": "1.5.3", @@ -4350,7 +4350,7 @@ "@walmart/react-native-collapsible": { "version": "1.5.3", "resolved": "https://npme.walmart.com/@walmart/react-native-collapsible/-/react-native-collapsible-1.5.3.tgz", - "integrity": "sha512-A/eHjceqHN2FJVaimSrKO/wIHgP5ymIoiyTMRa10ce8NZ7ejhPelIkCqzwjvQ328HG38y7HPelvu/6xlsiFlUQ==", + "integrity": "sha1-XoOvTwTbUqaib/9Ii//qp9yNBQk=", "requires": { "prop-types": "^15.6.2" } @@ -4358,7 +4358,7 @@ "@walmart/react-native-env": { "version": "0.2.0", "resolved": "https://npme.walmart.com/@walmart/react-native-env/-/react-native-env-0.2.0.tgz", - "integrity": "sha512-YkJeKZP5HuqzZF6y4H/mnktOuWzMhDUFYOkjItGfuesYSZaigcZYOklu6Ut5FFwWgy7xiS+FzvMW7IUZkxKlOw==" + "integrity": "sha1-Wj8o61r2LUN+3ZXhDrzrmHwelGU=" }, "@walmart/react-native-logger": { "version": "1.28.0", @@ -4368,7 +4368,7 @@ "@walmart/react-native-shared-navigation": { "version": "0.4.0", "resolved": "https://npme.walmart.com/@walmart/react-native-shared-navigation/-/react-native-shared-navigation-0.4.0.tgz", - "integrity": "sha512-xXCe5sJeytOO9HAKLaTiQQMzomfUS2wUP6ICLYv9BGtdJUDmoKNT7aFYeRDGPgvPvkc1A8oFrqJIrOshjLnxSg==" + "integrity": "sha1-dBX44FzZJKjZPuXiMoFiFQzybYE=" }, "@walmart/react-native-sumo-sdk": { "version": "2.1.0", @@ -4475,9 +4475,9 @@ } }, "@walmart/taskit-mini-app": { - "version": "0.201.0-rc.0", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.201.0-rc.0.tgz", - "integrity": "sha512-P0TZ3tX+owgz62wDaPZLnJDyUYIQ3dfw1DWDw44lwp0JUZwnaGeqH+UmWjQeukahvlWXYS8L65z0x75paTdliQ==" + "version": "0.0.213", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.0.213.tgz", + "integrity": "sha512-5VWYdyglAHGG/w3mMemsthGKVSAZ8xhvi8AaZ4vB8nwky1vxhaKIhXqD6TJcBTjgmH2AiJ4GvGecy4Bc0AhF7Q==" }, "@walmart/time-clock-mini-app": { "version": "0.4.27", @@ -17305,7 +17305,7 @@ "react-native-wm-config": { "version": "0.1.1", "resolved": "https://npme.walmart.com/react-native-wm-config/-/react-native-wm-config-0.1.1.tgz", - "integrity": "sha512-s3S3bciDoyVqUyfzVKsXJp+aQxPriU62yL+cvbBJB6d7sGnCFHDQHF7/2y8YfK4Qc756VQ2o3SgCzlcQEYoTEw==" + "integrity": "sha1-Nn+tRZascRxL031AMLmpsn4nbB4=" }, "react-native-wm-network": { "version": "0.2.0", @@ -17320,7 +17320,7 @@ "react-native-wm-telemetry": { "version": "0.3.0", "resolved": "https://npme.walmart.com/react-native-wm-telemetry/-/react-native-wm-telemetry-0.3.0.tgz", - "integrity": "sha512-zTOSJ7BMbGHaqAF8+LDQI/s5winKcxsHSe4hv49gUbfDz19v71apgNchz31W1D2UQP+kNgrglrmCdmr5RdI8mw==" + "integrity": "sha1-8QwZvpngLi+J6pHSOcu+5HqQcLs=" }, "react-native-wm-voice-text": { "version": "0.6.0", @@ -18423,7 +18423,7 @@ "squiggly-localization": { "version": "0.0.2", "resolved": "https://npme.walmart.com/squiggly-localization/-/squiggly-localization-0.0.2.tgz", - "integrity": "sha512-9j/XUl0XvLk5wksN/nhOcRHmHesVHopX7v3Z1Hv398/656CLarKW0FAqL28zjKO68YH566s8PM1gflrAayBuMA==" + "integrity": "sha1-3ksz5Io53VPnUBiRSVDpxDaSGHU=" }, "sshpk": { "version": "1.16.1", @@ -19818,7 +19818,7 @@ "wfm-allspark-data-library": { "version": "0.0.11", "resolved": "https://npme.walmart.com/wfm-allspark-data-library/-/wfm-allspark-data-library-0.0.11.tgz", - "integrity": "sha512-o34ej3nNhCcy3uwWkOJcU/3zjXmX+VvbqiZrEgQwrxbO6cbJGxiK1Tz/JQX8j1lwi6cZFJKvDOucJtlduzVQrg==", + "integrity": "sha1-E27LsiPO+Sbj5h3p0FQpcH9VU8g=", "requires": { "@walmart/functional-components": "^1.0.22", "@walmart/react-native-env": "^0.1.0", @@ -19832,7 +19832,7 @@ "@walmart/react-native-env": { "version": "0.1.0", "resolved": "https://npme.walmart.com/@walmart/react-native-env/-/react-native-env-0.1.0.tgz", - "integrity": "sha512-ooH0AqLGhS5PNcLaOWRHAEIIvrYIyTUXqshlHkgEKDLhLtGW8WvFu0mlcCXb1FEUc/PVmKEzHNHYV1gzGNBqxQ==" + "integrity": "sha1-ojNwDE5pPTzF1RuQXDc//Fnlpz0=" }, "moment": { "version": "2.24.0", @@ -19842,7 +19842,7 @@ "react-native-ssmp-sso-allspark": { "version": "0.0.1-rc8", "resolved": "https://npme.walmart.com/react-native-ssmp-sso-allspark/-/react-native-ssmp-sso-allspark-0.0.1-rc8.tgz", - "integrity": "sha512-4ZWTteIvddzP7Lg3EM0KP1fDfcN8nx7v5yvHASCLUpoZvhxHQUkjj8uTt4TkJxvTuEK16w7mTwHDauTrIC/BJg==" + "integrity": "sha1-/SHw48C+3muBMp2bynExhYPZl0s=" } } }, @@ -19919,12 +19919,12 @@ "wifi-store-locator": { "version": "1.0.0-alpha2", "resolved": "https://npme.walmart.com/wifi-store-locator/-/wifi-store-locator-1.0.0-alpha2.tgz", - "integrity": "sha512-Gj0fP/NwQAguJrxEuRuHQjlUHDDH2qnFZAGgh1R0l1CUAPKFROL8L8gHZ1GDKnfoYMev7AOXKcEbZVcXpNomOg==" + "integrity": "sha1-W1OXsVMHI8dYMcI0QKg6pJO/R3Q=" }, "wm-react-native-vector-icons": { "version": "1.0.33", "resolved": "https://npme.walmart.com/wm-react-native-vector-icons/-/wm-react-native-vector-icons-1.0.33.tgz", - "integrity": "sha512-pAcEq6iOVxzKM55qucKOkh2ML3kii4yGJ5YdmMEOcRAGH4fQ1lHa7BETIl+jzX5n1ZVKgWkzmAiH3vw0nkuklQ==", + "integrity": "sha1-vIAL0WOWBBaAsIuacYHnzsxTQxk=", "requires": { "lodash": "^4.0.0", "prop-types": "^15.6.2", --- package.json @@ -101,7 +101,7 @@ "@walmart/schedule-mini-app": "0.12.0", "@walmart/settings-mini-app": "1.6.0", "@walmart/shelfavailability-mini-app": "0.8.3", - "@walmart/taskit-mini-app": "^0.201.0-rc.0", + "@walmart/taskit-mini-app": "0.0.213", "@walmart/time-clock-mini-app": "0.4.27", "@walmart/ui-components": "1.3.0-rc.13", "@walmart/welcomeme-mini-app": "0.44.0",
upgrading taskit version
upgrading taskit version
e800aac87f2bb666c44b1c59211386b4ec989dad
--- .looper.multibranch.yml @@ -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,6 +383,8 @@ 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" @@ -508,6 +510,8 @@ 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:]'`
android changes
android changes
268f8507f12aa24e669b4517ca742d2cb136fee5
--- src/home/index.tsx @@ -1,6 +1,6 @@ import {AllsparkFeatureModule} from '@walmart/allspark-foundation/Feature'; import {renderDrawerButton} from '@walmart/allspark-foundation/Navigation'; -import {CORE_CONTAINERS} from '@walmart/me-at-walmart-common'; +import {COMPONENT_CONTAINERS} from '@walmart/me-at-walmart-common'; import {enUS, esMX} from './translations'; import {GreetingRow} from './components/GreetingRow'; @@ -16,27 +16,27 @@ export const HomeFeature = new AllsparkFeatureModule('home', { components: { 'GreetingRow': { component: GreetingRow, - containerId: CORE_CONTAINERS.HOME_DASHBOARD + containerId: COMPONENT_CONTAINERS.HOME_DASHBOARD }, 'CovidBanner': { component: CovidBanner, - containerId: CORE_CONTAINERS.HOME_DASHBOARD + containerId: COMPONENT_CONTAINERS.HOME_DASHBOARD }, 'LinkCard': { component: LinkCard, - containerId: CORE_CONTAINERS.HOME_DASHBOARD + containerId: COMPONENT_CONTAINERS.HOME_DASHBOARD }, 'CellularDataSaver': { component: DataSaverWidget, - containerId: CORE_CONTAINERS.HOME_DASHBOARD + containerId: COMPONENT_CONTAINERS.HOME_DASHBOARD }, 'CelebrationCard': { component: CelebrationCard, - containerId: CORE_CONTAINERS.HOME_DASHBOARD + containerId: COMPONENT_CONTAINERS.HOME_DASHBOARD }, 'TaskCard': { component: TaskCard, - containerId: CORE_CONTAINERS.HOME_DASHBOARD + containerId: COMPONENT_CONTAINERS.HOME_DASHBOARD } }, screens: { --- src/navigation/USHallway/AssociateHallwayNav/Tabs/config.tsx @@ -93,7 +93,7 @@ export const renderTabBarButton = (props: BottomTabBarButtonProps) => ( ); export function renderTabBarIcon( - this: {icon: string; iconSelected: string}, + this: { icon: string; iconSelected: string }, props: { focused: boolean; color: string; @@ -112,7 +112,7 @@ export function renderTabBarIcon( } export function renderTabBarLabel( - this: {label: string}, + this: { label: string }, props: { focused: boolean; color: string; @@ -146,7 +146,7 @@ const ROUTE_ICON_ACTIVE_MAP = { export function getOptionsForRoute( this: { translate: TFunction; - config: {[key: string]: Partial<BottomNavOption>}; + config: { [key: string]: Partial<BottomNavOption> }; }, { route, @@ -259,7 +259,8 @@ export const getBottomNavConfigMap = createSelector( export const communicationHeaderStyle = StyleSheet.create({ headerStyle: { flexDirection: 'row', - gap: 10, + gap: 16, + marginRight: 8, }, });
fix: home components registered to incorrect container
fix: home components registered to incorrect container
7857d2ef50aa9c76cdfd19cbc7772ef347f840fd
--- sonar-project.properties @@ -5,7 +5,7 @@ sonar.host.url=http://sonar.looper.prod.walmartlabs.com sonar.sources=packages/allspark-authentication/src, packages/allspark-foundation/src, packages/allspark-utils/src sonar.tests=packages/allspark-authentication/__tests__, packages/allspark-foundation/__tests__, packages/allspark-utils/__tests__ -sonar.exclusions=packages/allspark-authentication/src/Authentication.ts, packages/allspark-foundation/src/cli/*, packages/allspark-foundation/src/Container/*, packages/allspark-foundation/src/Core/*, packages/allspark-foundation/src/Feature/*, packages/allspark-foundation/src/GraphQL/*, packages/allspark-foundation/src/HTTP/*, packages/allspark-foundation/src/Network/*, packages/allspark-foundation/src/Telemetry/* +sonar.exclusions=packages/allspark-authentication/src/Authentication.ts, packages/allspark-foundation/src/cli/*, packages/allspark-foundation/src/Container/*, packages/allspark-foundation/src/Core/*, packages/allspark-foundation/src/Feature/*, packages/allspark-foundation/src/GraphQL/**/*, packages/allspark-foundation/src/HTTP/**/*, packages/allspark-foundation/src/LocalStorage, packages/allspark-foundation/src/Navigation, packages/allspark-foundation/src/Notification, packages/allspark-foundation/src/Scanner, packages/allspark-foundation/src/Translation, packages/allspark-foundation/src/utils, packages/allspark-foundation/src/Network/*, packages/allspark-foundation/src/Telemetry/* sonar.sourceEncoding=UTF-8 sonar.typescript.lcov.reportPaths=coverage/lcov.info sonar.testExecutionReportPaths=test-report.xml \ No newline at end of file
chore: edit sonar project file
chore: edit sonar project file
49dcf5556e8485a10e6bf2e98c9f73776b93f74b
--- src/hooks/teams.ts @@ -141,7 +141,6 @@ export const useGetTeamById = (teamId: string) => { const envConfig = useEnvironment(); const response = useGetTeamByIdQuery({ variables: { - businessUnitNumber: Number(storeNbr)!, siteNbr: storeNbr!, date: moment().format('YYYY-MM-DD'), teamId, @@ -190,7 +189,6 @@ export const useGetTeamsByStore = () => { const response = useGetTeamsByStoreQuery({ variables: { includeManagement: true, - businessUnitNumber: Number(storeNbr)!, siteNbr: storeNbr!, date: moment().format('YYYY-MM-DD'), countryCode: countryCode!,
Removing businessUnitNumber from files
Removing businessUnitNumber from files
a3dd5b82853ec81960068c8b2a4d5cb069758ad3
--- src/constants.ts @@ -1,3 +1,5 @@ +import {colors} from '@walmart/gtp-shared-components/dist'; + //TODO: Move this to more standard place export const RNFBConfigAndroid = '75AC25EB-432A-47D1-855A-84728D2AB60C'; export const RNFBConfigiOS = '75AC25EB-432A-47D1-855A-84728D2AB60C'; @@ -17,3 +19,16 @@ export enum payTypes { SALARIED = 'S', HOURLY = 'H', } + +export const textingMiniAppBadgeStyle = { + fontFamily: 'Bogle-Bold', + fontSize: 12, + borderWidth: 1, + borderColor: colors.orange['160'], + backgroundColor: colors.spark['100'], + top: -5, + transform: [{scale: 0.85}], + justifyContent: 'center', + alignItems: 'center', + textAlign: 'center', +} as any; --- src/index.tsx @@ -24,14 +24,19 @@ import {initi18n} from './translations'; import {MeganavScreen} from './screens/MeganavScreen'; import {ClockedOutScreenGuard} from './components/ClockedOutScreenGuard'; import {useChannelUnread} from './channels'; +import {textingMiniAppBadgeStyle} from './constants'; export {PushToTalkProvider} from './channels/pushToTalkProvider'; export const LOGGER_FIELDS = {id: 'texting-mini-app'}; -export const Hooks = { +export const myTeamHooks = { useChannelUnread, }; +export const myTeamBadgeStyle = { + textingMiniAppBadgeStyle, +}; + // TODO: This needs to be reconsidered when we go production export const initialize = async (debugToken: string) => { const rnfbProvider = firebase --- src/constants.ts @@ -1,3 +1,5 @@ +import {colors} from '@walmart/gtp-shared-components/dist'; + //TODO: Move this to more standard place export const RNFBConfigAndroid = '75AC25EB-432A-47D1-855A-84728D2AB60C'; export const RNFBConfigiOS = '75AC25EB-432A-47D1-855A-84728D2AB60C'; @@ -17,3 +19,16 @@ export enum payTypes { SALARIED = 'S', HOURLY = 'H', } + +export const textingMiniAppBadgeStyle = { + fontFamily: 'Bogle-Bold', + fontSize: 12, + borderWidth: 1, + borderColor: colors.orange['160'], + backgroundColor: colors.spark['100'], + top: -5, + transform: [{scale: 0.85}], + justifyContent: 'center', + alignItems: 'center', + textAlign: 'center', +} as any; --- src/index.tsx @@ -24,14 +24,19 @@ import {initi18n} from './translations'; import {MeganavScreen} from './screens/MeganavScreen'; import {ClockedOutScreenGuard} from './components/ClockedOutScreenGuard'; import {useChannelUnread} from './channels'; +import {textingMiniAppBadgeStyle} from './constants'; export {PushToTalkProvider} from './channels/pushToTalkProvider'; export const LOGGER_FIELDS = {id: 'texting-mini-app'}; -export const Hooks = { +export const myTeamHooks = { useChannelUnread, }; +export const myTeamBadgeStyle = { + textingMiniAppBadgeStyle, +}; + // TODO: This needs to be reconsidered when we go production export const initialize = async (debugToken: string) => { const rnfbProvider = firebase
update style for the badge
update style for the badge
46b7975517d19c53d3d27be99dabb417d979b10f
--- android/app/build.gradle @@ -134,7 +134,7 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 38 + versionCode 39 versionName "1.0.2" } splits { --- ios/AllSpark/Info.plist @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>38</string> + <string>39</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>38</string> + <string>39</string> </dict> </plist>
Incrementing build number
Incrementing build number
2c8484fc97ff933456a5ab41098e3bf3367c3428
--- package-lock.json @@ -5307,9 +5307,9 @@ } }, "@walmart/iteminfo-mini-app": { - "version": "5.0.11", - "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-5.0.11.tgz", - "integrity": "sha512-ORWg0JU/Uk0MU2Kr7JaoBNPgBp7vQG36bS32FK+iURdLg/iAaVSfII+LpiTmzINldVyacoPd5gTEklPKUH1N1A==" + "version": "5.1.2", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-5.1.2.tgz", + "integrity": "sha512-GiysGtoLRVszzCUGo1yjqJaaqHYcp5ETIo+6BNd4oZihJ2+mb8RqQ+PC5689lb6JkTvnphQsPCVYkmu9GCIJ4w==" }, "@walmart/manager-approvals-miniapp": { "version": "0.0.62", --- package.json @@ -95,7 +95,7 @@ "@walmart/impersonation-mini-app": "1.2.0", "@walmart/ims-print-services-ui": "1.1.3", "@walmart/inbox-mini-app": "0.55.0", - "@walmart/iteminfo-mini-app": "5.0.11", + "@walmart/iteminfo-mini-app": "5.1.2", "@walmart/manager-approvals-miniapp": "0.0.62", "@walmart/me-field-mini-app": "1.1.22", "@walmart/metrics-mini-app": "0.9.12",
Item info drop 8.1 scanner changes
Item info drop 8.1 scanner changes
5bb4f98b9128963c7e9be408a4c8f45130835e7c
--- packages/allspark-foundation-hub/__tests__/HubFeature/TeamOnboarding/ListHeader.test.tsx @@ -0,0 +1,115 @@ +import React from 'react'; +import { render } from '../../utils'; +import { fireEvent } from '@testing-library/react-native'; +import ListHeader from '../../../src/HubFeature/TeamSelection/Component/ListHeader'; +import { ListHeaderProps } from '../../../src/HubFeature/TeamSelection/types'; +import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation'; +import { useSelector } from 'react-redux'; + +jest.mock('react-redux', () => ({ + ...jest.requireActual('react-redux'), + useSelector: jest.fn(), +})); + +jest.mock('@walmart/allspark-foundation/Translation', () => ({ + useAllsparkTranslation: jest.fn(), +})); + +describe('ListHeader Tests', () => { + beforeEach(() => { + (useAllsparkTranslation as jest.Mock).mockReturnValue({ + t: (key: string, options?: any) => options?.defaultValue || key, + }); + jest.clearAllMocks(); + }); + + const mockProps: ListHeaderProps = { + userType: 'salariedAssociate', + selectedTeams: ['Team A', 'Team B'], + allAvailableTeams: ['Team A', 'Team B', 'Team C', 'Team D'], + handleSelectAll: jest.fn(), + styles: { + header: {}, + selectAllContainer: {}, + selectTeamsText: {}, + }, + }; + + test('renders list header Teams ', () => { + (useSelector as jest.Mock).mockReturnValue(true); + const { getByTestId } = render(<ListHeader {...mockProps} />); + expect(getByTestId('teamlist-teams-selectAll')).toBeDefined(); + }); + + it('renders null when userType is not salariedAssociate', () => { + const props = { ...mockProps, userType: 'teamLead' }; + const { queryByTestId } = render(<ListHeader {...props} />); + expect(queryByTestId('teamlist-teams-header')).toBeNull(); + }); + + it('renders header and select all option when showSelectAllOption is true', () => { + useSelector.mockReturnValue(true); + const props = { + ...mockProps, + selectedTeams: ['team1'], + allAvailableTeams: ['team1', 'team2'], + }; + const { getByTestId } = render(<ListHeader {...props} />); + + expect(getByTestId('teamlist-teams-header')).toBeDefined(); + expect(getByTestId('teamlist-teams-selectAll')).toBeDefined(); + expect(getByTestId('Checkbox')).toBeDefined(); + }); + + it('does not render select all option when showSelectAllOption is false', () => { + useSelector.mockReturnValue(false); + const props = { + ...mockProps, + selectedTeams: ['team1'], + allAvailableTeams: ['team1', 'team2'], + }; + const { queryByTestId, queryByRole } = render(<ListHeader {...props} />); + + expect(queryByTestId('teamlist-teams-selectAll')).toBeNull(); + expect(queryByRole('checkbox')).toBeNull(); + }); + + it('checkbox is checked when all teams are selected', () => { + useSelector.mockReturnValue(true); + const props = { + ...mockProps, + selectedTeams: ['team1', 'team2'], + allAvailableTeams: ['team1', 'team2'], + }; + const { getByTestId } = render(<ListHeader {...props} />); + + const checkbox = getByTestId('Checkbox'); + expect(checkbox.props.accessibilityState.checked).toBe(true); + }); + + it('checkbox is not checked when not all teams are selected', () => { + useSelector.mockReturnValue(true); + const props = { + ...mockProps, + selectedTeams: ['team1'], + allAvailableTeams: ['team1', 'team2'], + }; + const { getByTestId } = render(<ListHeader {...props} />); + + const checkbox = getByTestId('Checkbox'); + expect(checkbox.props.accessibilityState.checked).toBe(false); + }); + it('calls handleSelectAll when checkbox is pressed', () => { + useSelector.mockReturnValue(true); + const props = { + ...mockProps, + selectedTeams: ['team1'], + allAvailableTeams: ['team1', 'team2'], + }; + const { getByTestId } = render(<ListHeader {...props} />); + + const checkbox = getByTestId('Checkbox'); + fireEvent.press(checkbox); + expect(props.handleSelectAll).toHaveBeenCalled(); + }); +});
Adding ListHeader coverage
Adding ListHeader coverage
b61192694543ba7a1b62fc2de7c5a73a437f13dc
--- package.json @@ -103,7 +103,7 @@ "@walmart/core-services-allspark": "workspace:^", "@walmart/core-widget-registry": "workspace:^", "@walmart/counts-component-miniapp": "0.2.7", - "@walmart/digital-locks-mini-app": "1.5.3", + "@walmart/digital-locks-mini-app": "1.5.7", "@walmart/emergency-mini-app": "1.32.5", "@walmart/exception-mini-app": "1.8.19", "@walmart/expo-config-plugins": "~0.5.3", --- yarn.lock @@ -8051,9 +8051,9 @@ __metadata: languageName: node linkType: hard -"@walmart/digital-locks-mini-app@npm:1.5.3": - version: 1.5.3 - resolution: "@walmart/digital-locks-mini-app@npm:1.5.3::__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.5.3.tgz" +"@walmart/digital-locks-mini-app@npm:1.5.7": + version: 1.5.7 + resolution: "@walmart/digital-locks-mini-app@npm:1.5.7::__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.5.7.tgz" peerDependencies: "@walmart/allspark-foundation": ">=6.0.0" react: "*" @@ -8062,7 +8062,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/73ae3a9a3a5a1da3c8f1e040fb89707198725fd41e64d4d9aaa6218a5ba41648bd0aa0eb0e062288dd10e3db96bf9f87d59c65a43be071b7bc8c6506e7e94ef1 + checksum: 10c0/8acb3ae879971f313ef0ed95a9e0e569c47b2ab39f2f52c56252fa9e877e5c1b45ad4d3283a3f5b6917d034c2e8cc9a5b7c34a48640d4b6d1bc76c3b321468ad languageName: node linkType: hard @@ -8694,7 +8694,7 @@ __metadata: "@walmart/core-services-allspark": "workspace:^" "@walmart/core-widget-registry": "workspace:^" "@walmart/counts-component-miniapp": "npm:0.2.7" - "@walmart/digital-locks-mini-app": "npm:1.5.3" + "@walmart/digital-locks-mini-app": "npm:1.5.7" "@walmart/emergency-mini-app": "npm:1.32.5" "@walmart/exception-mini-app": "npm:1.8.19" "@walmart/expo-config-plugins": "npm:~0.5.3"
feat(digitalkey): bumped version to 1.5.7 (#4723)
feat(digitalkey): bumped version to 1.5.7 (#4723) * feat(digitalkey): bumped version to 1.5.4 * feat(digitalkey): bumped version to 1.5.4-rc.2 * feat(digitalkey): bumped version to 1.5.5 * feat(digitalkey): bumped version to 1.5.6 * feat(digitalkey): bumped version to 1.5.7 --------- Co-authored-by: gary wong <gary.wong@walmart.com> Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com>
4c3b760eafae148be32d55052e7f6476f38cd7f0
--- packages/allspark-foundation/src/Translation/TranslationClient.ts @@ -129,7 +129,7 @@ export class TranslationClient { public configure = async (options: TranslationClientOptions) => { if (options.config) { this._config = { ...this._config, ...options.config }; - // this.i18n.options = this._config; + this.i18n.options = this._config; } if (options.languageDetector) {
fix: uncomment translation options (#518)
fix: uncomment translation options (#518)
f24ed3edbbf43bc5fd6f0f3e5049c534eb14bd3b
--- src/screens/MeganavScreen.tsx @@ -97,7 +97,7 @@ export const MeganavScreen: React.FC<MeganavScreenProps> = (props) => { navigation.pop(); }; const navigateToRoster = () => { - navigate('myTeam.tabs'); + navigate('myTeam', {params: {screen: 'myTeam.tabs'}}); }; return ( <ClockedOutScreenGuard> --- src/screens/MeganavScreen.tsx @@ -97,7 +97,7 @@ export const MeganavScreen: React.FC<MeganavScreenProps> = (props) => { navigation.pop(); }; const navigateToRoster = () => { - navigate('myTeam.tabs'); + navigate('myTeam', {params: {screen: 'myTeam.tabs'}}); }; return ( <ClockedOutScreenGuard>
View roster button on mega nav fix
View roster button on mega nav fix
976aacfd7ffbc63138309b7931b29cec81e312cf
--- __tests__/screens/NewMessageScreen/NewMessageScreenTest.tsx @@ -1,6 +1,6 @@ import React from 'react'; import {renderWithProviders} from '../../harness'; -import {NewMessageScreen} from '../../../dist/screens/NewMessageScreen'; +import {NewMessageScreen} from '../../../src/screens/NewMessageScreen'; import {useNavigation} from '@react-navigation/native'; import {StackNavigationProp} from '@react-navigation/stack'; import {TextingNavParamsMap} from '../../../src/navigation'; --- __tests__/screens/NewMessageScreen/NewMessageScreenTest.tsx @@ -1,6 +1,6 @@ import React from 'react'; import {renderWithProviders} from '../../harness'; -import {NewMessageScreen} from '../../../dist/screens/NewMessageScreen'; +import {NewMessageScreen} from '../../../src/screens/NewMessageScreen'; import {useNavigation} from '@react-navigation/native'; import {StackNavigationProp} from '@react-navigation/stack'; import {TextingNavParamsMap} from '../../../src/navigation';
adding new message screen
adding new message screen
bb181fb36441794305ac8ea24a914a380d10ede5
--- package-lock.json @@ -1919,9 +1919,9 @@ } }, "@walmart/moment-walmart": { - "version": "1.0.3", - "resolved": "https://npme.walmart.com/@walmart/moment-walmart/-/moment-walmart-1.0.3.tgz", - "integrity": "sha512-rq1NYboOSqlXtiorH3m+8FwaInZ9X6epZpecrf9IjPmxvsXWbCcFxjybtqcPhux6FzcViIUWsJ3gnZBhYls8rA==" + "version": "1.0.4", + "resolved": "https://npme.walmart.com/@walmart/moment-walmart/-/moment-walmart-1.0.4.tgz", + "integrity": "sha512-iTkDEL7GeYYS8laso4ECQ7DyHgBxnJh/uP5PJNQMHZyKb8niIwIwb19HFLuGBVRa9vZIjTz7mChSydbIn4KV0w==" }, "@walmart/push-to-talk-mini-app": { "version": "0.0.11", @@ -2000,6 +2000,11 @@ "xdate": "^0.8.0" }, "dependencies": { + "@walmart/moment-walmart": { + "version": "1.0.3", + "resolved": "https://npme.walmart.com/@walmart/moment-walmart/-/moment-walmart-1.0.3.tgz", + "integrity": "sha512-rq1NYboOSqlXtiorH3m+8FwaInZ9X6epZpecrf9IjPmxvsXWbCcFxjybtqcPhux6FzcViIUWsJ3gnZBhYls8rA==" + }, "moment": { "version": "2.27.0", "resolved": "https://npme.walmart.com/moment/-/moment-2.27.0.tgz", --- package.json @@ -41,11 +41,12 @@ "@walmart/config-components": "^1.0.4", "@walmart/functional-components": "^1.0.21", "@walmart/gtp-shared-components": "^0.2.2", + "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.0.11", "@walmart/react-native-logger": "^1.14.0", "@walmart/react-native-shared-navigation": "^0.2.0", "@walmart/redux-store": "^1.0.4", - "@walmart/schedule-mini-app": "^0.2.5", + "@walmart/schedule-mini-app": "0.2.5", "@walmart/ui-components": "^1.0.66", "@walmart/wfm-ui": "^0.1.13", "i18next": "^19.7.0",
lock schedule mini & add moment-walmart
lock schedule mini & add moment-walmart
34f9d2f2e98ab59ef1a5c3d056e6c3cc6137fb08
--- packages/me-at-walmart-container/src/index.tsx @@ -1,5 +1,4 @@ import { LogBox } from 'react-native'; -import { IMeAtWalmartEnvironment } from './environment'; // Known warnings with Me@Walmart required native modules. Container team needs to resolve. // Ignorning to not burden feature app teams with these messages. @@ -8,18 +7,11 @@ LogBox.ignoreLogs([ /Module WifiStoreLocator requires main queue setup/, ]); -export * from './queries'; -export * from './services/user/types'; - export { MeAtWalmartContainer } from './container'; -export type { IMeAtWalmartEnvironment }; +export type { IMeAtWalmartEnvironment } from './environment'; +// Used in Me@ Core App +export * from './queries'; +export * from './redux'; +export * from './services'; export * from './types'; - -export { MeAtWalmartUserSelectors } from './redux/user'; -export { MeAtWalmartNotificationActions } from './redux/notification'; -export { - waitForAppConfigFetch, - MeAtWalmartConfigActionCreators, - MeAtWalmartConfigActions, -} from './redux/config'; --- packages/me-at-walmart-container/src/redux/index.ts @@ -35,3 +35,13 @@ export const MeAtWalmartReduxConfig: AllsparkReduxConfig = { sagas: MeAtWalmartSagas, middleware: __DEV__ ? [createDebugger()] : undefined, }; + +// Used in Me@ Core App +export { MeAtWalmartAuthActions, MeAtWalmartAuthActionCreators } from './auth'; +export { + waitForAppConfigFetch, + MeAtWalmartConfigActionCreators, + MeAtWalmartConfigActions, +} from './config'; +export { MeAtWalmartNotificationActions } from './notification'; +export { MeAtWalmartUserSelectors } from './user'; --- packages/me-at-walmart-container/src/services/index.ts @@ -32,3 +32,7 @@ export const MeAtWalmartServices = { }; export type IMeAtWalmartServices = typeof MeAtWalmartServices; + +// Used in Me@ Core App +export { fetchSite } from './site'; +export * from './user/types';
fix: export functionality required by me at core app
fix: export functionality required by me at core app
4e27f85760f3cd85253f795420f02e4c9c3749a6
--- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/roster-mini-app", - "version": "1.0.14", + "version": "1.0.15", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/roster-mini-app", - "version": "1.0.14", + "version": "1.0.15", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.20.0", @@ -60,14 +60,13 @@ "@walmart/core-utils": "~2.0.5", "@walmart/functional-components": "~4.0.3", "@walmart/gtp-shared-components": "2.1.3", - "@walmart/impersonation-mini-app": "1.20.7", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-logger": "1.34.8", "@walmart/react-native-scanner-3.0": "0.4.2", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "1.0.12", + "@walmart/wmconnect-mini-app": "1.0.13", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", @@ -11717,24 +11716,6 @@ "react-native": "*" } }, - "node_modules/@walmart/impersonation-mini-app": { - "version": "1.20.7", - "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.20.7.tgz", - "integrity": "sha512-nQdm2UHmllwsY5jYGxdebgT2oXBvrhIVWutDvz1xtYHcD1ZkcSZpa8CQpnltTdeSRy0bJ8K8hfqtPSGTybum5g==", - "dev": true, - "peerDependencies": { - "@react-native-community/masked-view": ">=0.1.10", - "@react-native-community/picker": ">=1.8.1", - "@react-navigation/native": ">=5.7.3", - "@react-navigation/stack": ">=5.9.0", - "@walmart/react-native-shared-navigation": ">=0.2.0", - "@walmart/redux-store": ">=1.0.7", - "@walmart/ui-components": ">=1.0.91", - "react-i18next": ">=11.7.3", - "react-native-restart": ">=0.0.20", - "react-redux": ">=7.2.0" - } - }, "node_modules/@walmart/me-at-walmart-athena-queries": { "version": "1.7.5", "resolved": "https://npme.walmart.com/@walmart/me-at-walmart-athena-queries/-/me-at-walmart-athena-queries-1.7.5.tgz", @@ -11853,9 +11834,9 @@ } }, "node_modules/@walmart/wmconnect-mini-app": { - "version": "1.0.12", - "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.12.tgz", - "integrity": "sha512-0vaDvQB55hCZ0hRtAj1Dg4QOwAd+7H0WOeRmM8SlP/ZqEJ9DV6vy1mvKqtO0O+P/SpiQFwY/80EubJuKddNAfA==", + "version": "1.0.13", + "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.13.tgz", + "integrity": "sha512-8rrTfCmARDX3Y4wTfGG+o3bT4YXlZF4GysAJgn0KSjCq3Cr79r+6E3Zzbdlnqc883bamfAMrnqPe/cwTZSNiLw==", "dev": true, "hasInstallScript": true }, @@ -40993,12 +40974,6 @@ "moment": "^2.27.0" } }, - "@walmart/impersonation-mini-app": { - "version": "1.20.7", - "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.20.7.tgz", - "integrity": "sha512-nQdm2UHmllwsY5jYGxdebgT2oXBvrhIVWutDvz1xtYHcD1ZkcSZpa8CQpnltTdeSRy0bJ8K8hfqtPSGTybum5g==", - "dev": true - }, "@walmart/me-at-walmart-athena-queries": { "version": "1.7.5", "resolved": "https://npme.walmart.com/@walmart/me-at-walmart-athena-queries/-/me-at-walmart-athena-queries-1.7.5.tgz", @@ -41071,9 +41046,9 @@ } }, "@walmart/wmconnect-mini-app": { - "version": "1.0.12", - "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.12.tgz", - "integrity": "sha512-0vaDvQB55hCZ0hRtAj1Dg4QOwAd+7H0WOeRmM8SlP/ZqEJ9DV6vy1mvKqtO0O+P/SpiQFwY/80EubJuKddNAfA==", + "version": "1.0.13", + "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.13.tgz", + "integrity": "sha512-8rrTfCmARDX3Y4wTfGG+o3bT4YXlZF4GysAJgn0KSjCq3Cr79r+6E3Zzbdlnqc883bamfAMrnqPe/cwTZSNiLw==", "dev": true }, "@whatwg-node/events": { --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "1.0.14", + "version": "1.0.15", "private": false, "main": "dist/index.js", "files": [ @@ -83,14 +83,13 @@ "@walmart/core-utils": "~2.0.5", "@walmart/functional-components": "~4.0.3", "@walmart/gtp-shared-components": "2.1.3", - "@walmart/impersonation-mini-app": "1.20.7", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-logger": "1.34.8", "@walmart/react-native-scanner-3.0": "0.4.2", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "1.0.12", + "@walmart/wmconnect-mini-app": "1.0.13", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0",
Update version
Update version
6d819cd373e03f600196e3f1906b9a57180d4c2a
--- targets/US/android/app/src/beta/res/drawable-xxxhdpi/ic_notification_icon-17.png Binary files a/targets/US/android/app/src/beta/res/drawable-xxxhdpi/ic_notification_icon-17.png and /dev/null differ --- targets/US/android/app/src/beta/res/drawable-xxxhdpi/ic_notification_icon.png Binary files a/targets/US/android/app/src/beta/res/drawable-xxxhdpi/ic_notification_icon.png and b/targets/US/android/app/src/beta/res/drawable-xxxhdpi/ic_notification_icon.png differ --- targets/US/android/app/src/dev/My Walmart app icon-2.png Binary files a/targets/US/android/app/src/dev/My Walmart app icon-2.png and /dev/null differ --- targets/US/android/app/src/dev/ic_launcher-playstore.png Binary files a/targets/US/android/app/src/dev/ic_launcher-playstore.png and b/targets/US/android/app/src/dev/ic_launcher-playstore.png differ --- targets/US/android/app/src/main/res/drawable-xxxhdpi/ic_notification_icon-16.png Binary files a/targets/US/android/app/src/main/res/drawable-xxxhdpi/ic_notification_icon-16.png and /dev/null differ --- targets/US/android/app/src/main/res/drawable-xxxhdpi/ic_notification_icon.png Binary files a/targets/US/android/app/src/main/res/drawable-xxxhdpi/ic_notification_icon.png and b/targets/US/android/app/src/main/res/drawable-xxxhdpi/ic_notification_icon.png differ --- targets/US/android/app/src/teflon/ic_launcher-playstore.png Binary files a/targets/US/android/app/src/teflon/ic_launcher-playstore.png and b/targets/US/android/app/src/teflon/ic_launcher-playstore.png differ
Updated android icons
Updated android icons
d3c8d55e299270b7093dede2cc439228bfe3b907
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.12.1-alpha.11", + "version": "2.12.1-alpha.12", "main": "dist/index.js", "files": [ "dist" @@ -104,7 +104,7 @@ "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "6.1.4", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "2.8.0-alpha.10", + "@walmart/wmconnect-mini-app": "2.8.0-alpha.11", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", --- src/screens/index.tsx @@ -10,7 +10,6 @@ import { import {ClockGuard} from '@walmart/allspark-foundation/Clock/withClockGuard'; import {PresenceProvider} from '@walmart/wmconnect-mini-app'; -import {translationClient} from '../common'; export const RosterMiniApp = () => { return ( @@ -39,7 +38,7 @@ const rosterExperienceScreen = RosterFeature.createScreen< tags: [ScreenTags.MyTeamTab], clockCheckRequired: true, options: { - title: translationClient.translate('roster.title'), + title: 'Roster', }, }); --- yarn.lock @@ -6397,7 +6397,7 @@ __metadata: "@walmart/react-native-sumo-sdk": "npm:2.6.0" "@walmart/redux-store": "npm:6.1.4" "@walmart/ui-components": "npm:1.15.1" - "@walmart/wmconnect-mini-app": "npm:2.8.0-alpha.10" + "@walmart/wmconnect-mini-app": "npm:2.8.0-alpha.11" babel-jest: "npm:^29.2.1" chance: "npm:^1.1.11" eslint: "npm:8.22.0" @@ -6530,9 +6530,9 @@ __metadata: languageName: node linkType: hard -"@walmart/wmconnect-mini-app@npm:2.8.0-alpha.10": - version: 2.8.0-alpha.10 - resolution: "@walmart/wmconnect-mini-app@npm:2.8.0-alpha.10" +"@walmart/wmconnect-mini-app@npm:2.8.0-alpha.11": + version: 2.8.0-alpha.11 + resolution: "@walmart/wmconnect-mini-app@npm:2.8.0-alpha.11" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6572,7 +6572,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/aca612d702acbbcf6b9640c6a6159e46650c28373aa8edb4708bc987801c571e350ed0b17f9f8d7612f58bad7ff274741e8194bb18ccddbe552be6696010617b + checksum: 10c0/f9e66cb910d7bcd1ffc049d210d689fc9b82fd6d81b944e36caa9672235ae3e5cec294f9dd3a56cd56130b8369cc201ca92f10cd3c43dab89dd72bd7c672436f languageName: node linkType: hard
Update roster mini app version
Update roster mini app version
3bb8a7b6d449fdc9b3c822435ace90c555dab8a4
--- src/hooks/teams.ts @@ -1,6 +1,6 @@ import {useSelector} from 'react-redux'; import {useGetTeamByIdQuery} from '../queries/getTeamById'; -import {useGetTeamsByStoreQuery} from '../queries/getTeamsByStore'; +import {useGetTeamsByStoreQuery} from '../queries/getTeamsBStore'; import {Associate} from '../types'; import {logger} from '../common/logger'; import {useDailyRoster} from './roster'; --- src/queries/getTeamsBStore.graphql --- src/queries/getTeamsBStore.ts
feat: dummy commit
feat: dummy commit
1d96adf03e9a38c0f95b47afb9426b2540530e73
--- CODEOWNERS @@ -0,0 +1 @@ +* @allspark/texting-devs \ No newline at end of file --- CODEOWNERS @@ -0,0 +1 @@ +* @allspark/texting-devs \ No newline at end of file
add code owners
add code owners
224fc3256420b092c344fe77ddef78fd300677f8
--- targets/US/package.json @@ -102,7 +102,7 @@ "@walmart/emergency-mini-app": "1.29.10", "@walmart/exception-mini-app": "1.8.11", "@walmart/facilities-management-miniapp": "patch:@walmart/facilities-management-miniapp@npm%3A0.15.7#~/.yarn/patches/@walmart-facilities-management-miniapp-npm-0.15.7-5b9d1150f9.patch", - "@walmart/feedback-all-spark-miniapp": "0.9.71", + "@walmart/feedback-all-spark-miniapp": "0.9.72", "@walmart/financial-wellbeing-feature-app": "1.26.0", "@walmart/functional-components": "~6.3.28", "@walmart/gta-react-native-calendars": "0.7.0", --- yarn.lock @@ -6667,35 +6667,26 @@ __metadata: languageName: node linkType: hard -"@walmart/feedback-all-spark-miniapp@npm:0.9.71": - version: 0.9.71 - resolution: "@walmart/feedback-all-spark-miniapp@npm:0.9.71" +"@walmart/feedback-all-spark-miniapp@npm:0.9.72": + version: 0.9.72 + resolution: "@walmart/feedback-all-spark-miniapp@npm:0.9.72" peerDependencies: - "@react-native-async-storage/async-storage": ^1.19.0 - "@react-native-community/datetimepicker": 7.6.2 - "@react-native-picker/picker": 2.4.2 "@react-navigation/native": ^6.0.0 "@react-navigation/stack": ^6.1.0 - "@walmart/core-services": ~2.0.19 - "@walmart/gtp-shared-components": 2.1.9 - "@walmart/impersonation-mini-app": 1.18.3 - "@walmart/react-native-logger": 1.34.7 - "@walmart/react-native-shared-navigation": 1.0.2 - "@walmart/redux-store": 3.1.5 - "@walmart/ui-components": 1.10.1 - crypto-js: ^3.3.0 + "@walmart/allspark-foundation": "*" + "@walmart/core-services": ">=6" + "@walmart/gtp-shared-components": ^2.1.9 + "@walmart/react-native-shared-navigation": ">=1.0.2" + "@walmart/redux-store": ">=6" + "@walmart/ui-components": ">=1.10.1" + crypto-js: ~4.2.0 react: ^18.2.0 - react-native: 0.73.7 - react-native-background-timer: ^2.4.1 - react-native-drop-shadow: ">=1.0.0" - react-native-vector-icons: ^9.2.0 - react-native-webview: 13.6.1 - react-native-wm-telemetry: 0.4.0 + react-native: ~0.73.7 react-navigation: ^4.4.3 react-redux: ^7.2.1 reduxsauce: ^1.2.0 reselect: ^4.0.0 - checksum: 10c0/e1e67470c638a01de03d273699c58195e15b6c1cbc8f8e7ac9f1aeb67385f90c70ab302955e541d2c2a5073e55c6927fc1dd44e3d78293c05aa4a4fd12449339 + checksum: 10c0/8a3fd9a2bc97de337d118a823850a73423b17b9c61eb14cbe20f11239991535ebb45cd95508619843c1a679a7a7007054ff4340cc23264783925556b7da0769b languageName: node linkType: hard @@ -7304,7 +7295,7 @@ __metadata: "@walmart/emergency-mini-app": "npm:1.29.10" "@walmart/exception-mini-app": "npm:1.8.11" "@walmart/facilities-management-miniapp": "patch:@walmart/facilities-management-miniapp@npm%3A0.15.7#~/.yarn/patches/@walmart-facilities-management-miniapp-npm-0.15.7-5b9d1150f9.patch" - "@walmart/feedback-all-spark-miniapp": "npm:0.9.71" + "@walmart/feedback-all-spark-miniapp": "npm:0.9.72" "@walmart/financial-wellbeing-feature-app": "npm:1.26.0" "@walmart/functional-components": "npm:~6.3.28" "@walmart/gta-react-native-calendars": "npm:0.7.0"
GDVCVR-17536 phase one changes and core package upgrades
GDVCVR-17536 phase one changes and core package upgrades
dced6061af52518a7b58d5c421a12e8dbc59af62
--- .looper.multibranch.yml @@ -23,21 +23,21 @@ envs: global: variables: market: .. - XCODE_PROJECT_PATH: ./ios/AllSpark.xcodeproj + XCODE_PROJECT_PATH: ./ios/MeWalmart.xcodeproj ANDROID_GRADLE_PATH: ./android/app/build.gradle IOS_BASE_PATH: ./ios ANDROID_BASE_PATH: ./android us-market: variables: - XCODE_PROJECT_PATH: ./ios/AllSpark.xcodeproj + XCODE_PROJECT_PATH: ./ios/MeWalmart.xcodeproj ANDROID_GRADLE_PATH: ./android/app/build.gradle IOS_BASE_PATH: ./ios ANDROID_BASE_PATH: ./android intl-market: variables: - XCODE_PROJECT_PATH: ./ios/AllSpark.xcodeproj + XCODE_PROJECT_PATH: ./ios/MeWalmart.xcodeproj ANDROID_GRADLE_PATH: ./android/app/build.gradle IOS_BASE_PATH: ./ios ANDROID_BASE_PATH: ./android
chore: fix ios project name reference
chore: fix ios project name reference
ed6b0aa3a43690ebbc4caedc937b7fe2299d8f15
--- babel.config.js @@ -1,9 +1,7 @@ module.exports = function (api) { api.cache(true); const presets = ['module:metro-react-native-babel-preset']; - const plugins = ['@babel/plugin-transform-flow-strip-types']; return { presets, - plugins }; } --- package-lock.json @@ -18,7 +18,6 @@ ], "devDependencies": { "@babel/core": "^7.20.0", - "@babel/plugin-transform-flow-strip-types": "^7.23.3", "@babel/preset-env": "^7.20.0", "@babel/runtime": "^7.20.0", "@commitlint/config-conventional": "^16.2.1", --- package.json @@ -31,7 +31,6 @@ }, "devDependencies": { "@babel/core": "^7.20.0", - "@babel/plugin-transform-flow-strip-types": "^7.23.3", "@babel/preset-env": "^7.20.0", "@babel/runtime": "^7.20.0", "@commitlint/config-conventional": "^16.2.1",
fix: remove flow strip type plugin
fix: remove flow strip type plugin
f229ffd8ee0fb26dd1b05dd8768b60c4ab82d0e1
--- packages/allspark-foundation/src/Container/AllsparkContainer.tsx @@ -202,7 +202,11 @@ export class AllsparkContainer< if (setup && !setup.complete) { AllsparkReduxStore.dispatch(ContainerActionCreators.SETUP_BEGIN(type)); - await Promise.all(setup.methods.map((method) => method())); + try { + await Promise.all(setup.methods.map((method) => method())); + } catch (e: any) { + console.log('Setup error logs:', e); + } this._setupMap.set(type, { ...setup, complete: true }); AllsparkReduxStore.dispatch(ContainerActionCreators.SETUP_COMPLETE(type)); } --- packages/allspark-foundation/src/Notification/client.ts @@ -275,7 +275,12 @@ export class NotificationClient { * Cancels pending notifications. */ public cancelNotifications = () => { - return Sumo.cancelNotifications(); + return Sumo.cancelNotifications + ? Sumo.cancelNotifications() + : new Promise((_, reject) => { + const error = new Error('Sumo cancelNotifications do not exist'); + reject(error); + }); }; public createNotificationChannel = (
feat(lib): react-native 77 support changes
feat(lib): react-native 77 support changes
cf6620a88cfd33b2724976c44615661365cb7251
--- package-lock.json @@ -79,7 +79,7 @@ "@walmart/returns-mini-app": "0.13.3", "@walmart/schedule-mini-app": "0.33.0", "@walmart/settings-mini-app": "1.12.0", - "@walmart/shelfavailability-mini-app": "1.5.12", + "@walmart/shelfavailability-mini-app": "1.5.13", "@walmart/taskit-mini-app": "0.49.12", "@walmart/time-clock-mini-app": "2.34.0", "@walmart/ui-components": "1.10.0", @@ -6172,9 +6172,9 @@ } }, "node_modules/@walmart/shelfavailability-mini-app": { - "version": "1.5.12", - "resolved": "https://npme.walmart.com/@walmart/shelfavailability-mini-app/-/shelfavailability-mini-app-1.5.12.tgz", - "integrity": "sha512-/9PQ4UsVnfK8z2oo9blOZMaWsoCclJCDn0g/zayDBzkkQx1jmlHrn0z0AmEjrNqxlL+E6Iru4ugQV2JdVOYY0w==", + "version": "1.5.13", + "resolved": "https://npme.walmart.com/@walmart/shelfavailability-mini-app/-/shelfavailability-mini-app-1.5.13.tgz", + "integrity": "sha512-6P9nNTvcS59vzeWoi2JKT4ldRTQgMShlzThbbagd6PzbPkOS+M2Tx009eR8GGL5YNwxUP1n3PKmCudppwE0J+w==", "peerDependencies": { "@react-native-community/async-storage": "^1.12.1", "@react-native-community/eslint-config": "^2.0.0", @@ -26149,9 +26149,9 @@ "integrity": "sha512-zOMTzrKXTxFosdbiNnFCkxcsJqi81JRdiHPq2Qs/0jnZZiIE85dB6liCDgO69rkSIKo+CCJThnz0HYi/jU07cQ==" }, "@walmart/shelfavailability-mini-app": { - "version": "1.5.12", - "resolved": "https://npme.walmart.com/@walmart/shelfavailability-mini-app/-/shelfavailability-mini-app-1.5.12.tgz", - "integrity": "sha512-/9PQ4UsVnfK8z2oo9blOZMaWsoCclJCDn0g/zayDBzkkQx1jmlHrn0z0AmEjrNqxlL+E6Iru4ugQV2JdVOYY0w==" + "version": "1.5.13", + "resolved": "https://npme.walmart.com/@walmart/shelfavailability-mini-app/-/shelfavailability-mini-app-1.5.13.tgz", + "integrity": "sha512-6P9nNTvcS59vzeWoi2JKT4ldRTQgMShlzThbbagd6PzbPkOS+M2Tx009eR8GGL5YNwxUP1n3PKmCudppwE0J+w==" }, "@walmart/taskit-mini-app": { "version": "0.49.12", --- package.json @@ -121,7 +121,7 @@ "@walmart/returns-mini-app": "0.13.3", "@walmart/schedule-mini-app": "0.33.0", "@walmart/settings-mini-app": "1.12.0", - "@walmart/shelfavailability-mini-app": "1.5.12", + "@walmart/shelfavailability-mini-app": "1.5.13", "@walmart/taskit-mini-app": "0.49.12", "@walmart/time-clock-mini-app": "2.34.0", "@walmart/ui-components": "1.10.0",
SA-355, SA-356, SA-357 update SA Firebase for new requirements
SA-355, SA-356, SA-357 update SA Firebase for new requirements
0df4913709216a846612f1cf8bbbeed8aa9adef2
--- packages/allspark-foundation/src/Components/TeamOnboarding/TeamSelection/types.ts
feat: update file type
feat: update file type
ac6c39059d1f45f5f3471c056f2688858c4c8857
--- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.0.0-beta.7", + "version": "1.0.0-beta.8", "description": "", "main": "Core/index.js", "types": "Core/index.d.ts", --- packages/allspark-foundation-hub/src/HubFeature/Hub/TeamSwitcher/index.tsx @@ -109,8 +109,6 @@ export const TeamSwitcher = ({ dispatch( ManagerExperienceCreators.updateSelectedTeamPreference(team.teamId) ); - dispatch(ManagerExperienceCreators.updateSelectedTeamIDs([team.teamId])); - onTeamChange(team.teamId, [team.teamId]); }; let evaluatedTeamList: TeamSwitcherTypes[]; @@ -170,10 +168,10 @@ export const TeamSwitcher = ({ const selectedTeamsList = teamData .filter((team: any) => team.teamLabel) .map((team: any) => team.teamId); - onTeamChange(teamId, selectedTeamsList); dispatch( ManagerExperienceCreators.updateSelectedTeamIDs(selectedTeamsList) ); + onTeamChange(teamId, selectedTeamsList); } else { dispatch(ManagerExperienceCreators.updateSelectedTeamIDs([teamId])); onTeamChange(teamId, [teamId]);
Update hubs version
Update hubs version
6f480a800897c8a03a748adde4c1206c923d64fe
--- CODEOWNERS @@ -2,7 +2,7 @@ # the repo. Unless a later match takes precedence they will be requested -# for review when someone opens a pull request. +# for review when someone opens a pull request - @allspark/allspark-admin-team @@ -10,10 +10,4 @@ # subdirectories -/packages/allspark-authentication/ @allspark/allspark-admin-team -/packages/allspark-foundation/ @allspark/allspark-admin-team -/packages/allspark-graphql-client/ @allspark/allspark-admin-team -/packages/allspark-http-client/ @allspark/allspark-admin-team -/packages/allspark-utils/ @allspark/allspark-admin-team -/packages/core-services/ @allspark/allspark-admin-team -/packages/core-utils/ @allspark/allspark-admin-team +/packages/ @allspark/allspark-admin-team
chore: update codeowners for core team to own all packages
chore: update codeowners for core team to own all packages
0fca599cea8c359021de00f7645698d0065e0b56
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/wmconnect-mini-app", - "version": "3.7.4", + "version": "3.7.5", "main": "dist/index.js", "files": [ "dist",
feat(ui): update modal guard
feat(ui): update modal guard
bd91016ffbae3def157679d132bcd7af0aef28b5
--- android/app/build.gradle @@ -134,7 +134,7 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 51 + versionCode 52 versionName "1.0.3" } splits { --- ios/AllSpark/Info.plist @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>51</string> + <string>52</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>51</string> + <string>52</string> </dict> </plist>
Incrementing build number
Incrementing build number
3fb663ec2cfbc058cab1937aa2a901e97c490a6c
--- src/core/storeConfigInit.ts @@ -23,7 +23,6 @@ export function* onUserChanged() { if (originalSite && parseInt(originalSite, 10)) { const currentSite: number = yield select(getSiteConfigId); if (originalSite !== String(currentSite)) { - console.log('FETCHING STORE CONFIG', originalSite, currentSite); yield call(storeConfigActions.storeConfigProgress); try { const storeConfig: Site = yield call(
Removing log
Removing log
507b7dcaf543d5d57808c415cd789fa452ecb746
--- __tests__/auth/SitePromptTest.tsx @@ -3,18 +3,20 @@ import {render, fireEvent} from '@testing-library/react-native'; import {userActions} from '@walmart/redux-store'; import {SitePrompt} from '../../src/auth/SitePrompt'; -test('prompt captures site input and updates user', () => { - const route = {} as any; - const navigation = {goBack: jest.fn()} as any; - const siteId = '100'; +const route = {} as any; +const navigation = {goBack: jest.fn()} as any; - const {getByTestId} = render( +test('prompt captures site input and updates user', () => { + const {getByTestId, toJSON} = render( <SitePrompt navigation={navigation} route={route} />, ); + expect(toJSON()).toMatchSnapshot(); + const siteInput = getByTestId('site_input'); const submitButton = getByTestId('site_submit_btn'); + const siteId = '100'; fireEvent.changeText(siteInput, siteId); fireEvent.press(submitButton); @@ -24,3 +26,8 @@ test('prompt captures site input and updates user', () => { }); expect(navigation.goBack).toHaveBeenCalled(); }); + +test('prompt matches snapshot for android', () => { + const {toJSON} = render(<SitePrompt navigation={navigation} route={route} />); + expect(toJSON()).toMatchSnapshot(); +}); --- __tests__/auth/__snapshots__/SitePromptTest.tsx.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`SitePrompt handles 1`] = ` +exports[`prompt captures site input and updates user 1`] = ` <View onLayout={[Function]} style={ @@ -72,6 +72,7 @@ exports[`SitePrompt handles 1`] = ` "paddingTop": 12, } } + testID="site_input" /> <PrimaryButton disabled={true} @@ -82,7 +83,7 @@ exports[`SitePrompt handles 1`] = ` "paddingTop": 20, } } - testID="SiteSubmitButton" + testID="site_submit_btn" > Submit </PrimaryButton> @@ -90,92 +91,7 @@ exports[`SitePrompt handles 1`] = ` </View> `; -exports[`SitePrompt renders default value 1`] = ` -<View - onLayout={[Function]} - style={ - Object { - "flex": 1, - "justifyContent": "center", - } - } -> - <View - style={ - Object { - "backgroundColor": "#fff", - "borderRadius": 16, - "elevation": 24, - "marginHorizontal": 16, - "padding": 20, - "shadowColor": "black", - "shadowOffset": Object { - "height": 1, - "width": 0, - }, - "shadowOpacity": 0.15, - "shadowRadius": 3, - "zIndex": 4, - } - } - > - <Text - style={ - Object { - "color": "#2e2f32", - "fontFamily": "Bogle-Bold", - "fontSize": 20, - "marginBottom": 20, - } - } - > - storePrompt.title - </Text> - <Text - style={ - Object { - "color": "#2e2f32", - "fontFamily": "Bogle-Regular", - "fontSize": 16, - } - } - > - storePrompt.siteNumber - </Text> - <TextInput - autoFocus={true} - importantForAutofill="no" - keyboardType="number-pad" - maxLength={5} - onChangeText={[Function]} - style={ - Object { - "borderBottomColor": "#2e2f32", - "borderBottomWidth": 1, - "color": "black", - "paddingBottom": 4, - "paddingTop": 12, - } - } - /> - <PrimaryButton - disabled={true} - onPress={[Function]} - style={ - Object { - "alignSelf": "flex-end", - "paddingTop": 20, - } - } - testID="SiteSubmitButton" - > - Submit - </PrimaryButton> - </View> -</View> -`; - -exports[`SitePrompt updates the text input 1`] = ` +exports[`prompt matches snapshot for android 1`] = ` <View onLayout={[Function]} style={ @@ -247,6 +163,7 @@ exports[`SitePrompt updates the text input 1`] = ` "paddingTop": 12, } } + testID="site_input" /> <PrimaryButton disabled={true} @@ -257,7 +174,7 @@ exports[`SitePrompt updates the text input 1`] = ` "paddingTop": 20, } } - testID="SiteSubmitButton" + testID="site_submit_btn" > Submit </PrimaryButton>
Site prompt test update
Site prompt test update
52836bfa9afa9fb13b4fd89debb4f5aca70530f9
--- android/app/src/main/assets/fonts/icomoon.ttf Binary files a/android/app/src/main/assets/fonts/icomoon.ttf and b/android/app/src/main/assets/fonts/icomoon.ttf differ --- ios/icomoon.ttf Binary files a/ios/icomoon.ttf and b/ios/icomoon.ttf differ
platform component upgrade
platform component upgrade
1bf1e49668331ecdf5f77775a234195309cd256e
--- packages/allspark-utils/__tests__/eventManagerTest.ts @@ -1,49 +1,96 @@ import { EventManager } from '../src/eventManager'; -describe('Event manager tests', () => { - it('is able to add an event, run it, and remove the event', () => { - const consolespy = jest - .spyOn(console, 'warn') - .mockImplementation(() => jest.fn()); - const mockListener1 = jest.fn(); - const manager = new EventManager(['event1']); - const removeListener1 = manager.addListener('event1', mockListener1); - manager.runEvent('event1', 'payload1'); - expect(mockListener1).toHaveBeenCalledWith('payload1'); - expect(mockListener1).toHaveBeenCalledTimes(1); - removeListener1.remove(); - manager.runEvent('event1', 'payload3'); - expect(mockListener1).toHaveBeenCalledTimes(1); - manager.runEvent('randomEvent', 'payload4'); // do nothing. - const mockFn = jest.fn(); - manager.addListener('randomEvent', mockFn); - expect(mockFn).toHaveBeenCalledWith('payload4'); - // New event manager with queueUnhandledEvents: false - const managerWithNoDefault = new EventManager(['unknownEvent'], { - queueUnhandledEvents: false, - }); - managerWithNoDefault.runEvent('unknownEvent', 'unknownPayload'); - expect(consolespy).toHaveBeenCalledWith( - 'Cannot run undefined event unknownEvent' - ); - managerWithNoDefault.runEventListener( - 'randomEvent2', - 'randomID', - 'payload4' - ); // do nothing. - expect(consolespy).toHaveBeenCalledWith( - 'Cannot run undefined event randomEvent2' - ); - managerWithNoDefault.removeListener('randomEvent', 'randomid'); // do nothing. - }); - - it('is able to add custom listener with id and run it', () => { - const manager = new EventManager(['event1']); - const mockListener1 = jest.fn(); - const removeListener1 = manager.addListener('event1', mockListener1, { - id: 'id1', - }); - manager.runEventListener('event1', 'id1', 'payload1'); - expect(mockListener1).toHaveBeenCalledWith('payload1'); +type EventPayloadMap = { + event1: { data: string }; + event2: { data: number }; +}; + +describe('EventManager', () => { + let eventManager: EventManager<EventPayloadMap>; + + beforeEach(() => { + eventManager = new EventManager<EventPayloadMap>(['event1', 'event2']); + }); + + test('should add and remove listeners', () => { + const listener = jest.fn(); + const subscription = eventManager.addListener('event1', listener); + + expect(eventManager.hasListener('event1')).toBe(true); + + subscription.remove(); + expect(eventManager.hasListener('event1')).toBe(false); + }); + + test('should run event listeners', () => { + const listener = jest.fn(); + eventManager.addListener('event1', listener); + + const payload = { data: 'test' }; + eventManager.runEvent('event1', payload); + + expect(listener).toHaveBeenCalledWith(payload); + }); + + test('should queue unhandled events', () => { + const payload = { data: 'test' }; + eventManager.runEvent('event1', payload); + + const listener = jest.fn(); + eventManager.addListener('event1', listener); + + expect(listener).toHaveBeenCalledWith(payload); + }); + + test('should run specific event listener by id', () => { + const listener1 = jest.fn(); + const listener2 = jest.fn(); + eventManager.addListener('event1', listener1, { id: 'id1' }); + eventManager.addListener('event1', listener2, { id: 'id2' }); + + const payload = { data: 'test' }; + eventManager.runEventListener('event1', 'id1', payload); + + expect(listener1).toHaveBeenCalledWith(payload); + expect(listener2).not.toHaveBeenCalled(); + }); + + test('should handle undefined events', () => { + // runEvent should not throw an error + + expect(() => + // @ts-ignore + eventManager.runEvent('unknownEvent', { data: 'test' }) + ).not.toThrow(); + + expect(() => + // @ts-ignore + eventManager.runEventListener('unknownEvent', { data: 'test' }) + ).not.toThrow(); + + expect(() => + // @ts-ignore + eventManager.removeListener('unknownEvent', { data: 'test' }) + ).not.toThrow(); + }); + + test('should handle event without listeners', () => { + const payload = { data: 'test' }; + eventManager.runEvent('event1', payload); + + expect(eventManager.hasListener('event1')).toBe(false); + }); + + test('should handle event with multiple listeners', () => { + const listener1 = jest.fn(); + const listener2 = jest.fn(); + eventManager.addListener('event1', listener1); + eventManager.addListener('event1', listener2); + + const payload = { data: 'test' }; + eventManager.runEvent('event1', payload); + + expect(listener1).toHaveBeenCalledWith(payload); + expect(listener2).toHaveBeenCalledWith(payload); }); }); --- packages/allspark-utils/src/eventManager.ts @@ -61,7 +61,11 @@ export class EventManager< * Returns whether or not the queue has the event and any listeners */ public hasListener = <K extends E>(event: K) => { - return this.hasEvent(event) && this._listeners[event].size > 0; + if (!this.hasEvent(event)) { + return false; + } + + return this._listeners[event].size > 0; }; /** @@ -73,7 +77,11 @@ export class EventManager< } else if (this._config.queueUnhandledEvents) { this._queue.enqueue(event, payload); } else { - console.warn(`Cannot run undefined event ${event.toString()}`); + console.warn( + `Unhandled event: ${event.toString()} with payload: ${JSON.stringify( + payload + )}` + ); } }; @@ -92,7 +100,11 @@ export class EventManager< // @todo - ID would not be considered when queue is flushed. Consider side effect of this. this._queue.enqueue(event, payload); } else { - console.warn(`Cannot run undefined event ${event.toString()}`); + console.warn( + `Unhandled event: ${event.toString()} with payload: ${JSON.stringify( + payload + )}` + ); } }; @@ -102,6 +114,8 @@ export class EventManager< public removeListener = <K extends E>(event: K, id: string) => { if (this.hasEvent(event)) { this._listeners[event].delete(id); + } else { + console.warn(`Unhandled event: ${event.toString()}`); } }; @@ -113,20 +127,23 @@ export class EventManager< listener: EventListener<EventPayloadMap[K]>, options?: { id: string } ): ListenerSubscription => { - // Unique id for listener - let id = uniqueId(); - - // Can be customized if key doesn't exist - if (options?.id && !this._listeners[event].has(options.id)) { - id = options.id; - } + let id; // Add event if there is none in the listener if (!this._listeners[event]) { + // Generate unique id if none is provided + id = options?.id || uniqueId(); + this._listeners[event] = new Map([ [id, listener as EventListener<EventPayloadMap[E]>], ]); } else { + // Generate unique id if none is provided or id already exists + id = + options?.id && !this._listeners[event].has(options.id) + ? options.id + : uniqueId(); + // Add to map of events listeners this._listeners[event].set( id,
fix: event manager not handling undefined events in adding listener
fix: event manager not handling undefined events in adding listener
a6820979b9f26104c85d9a7d46283744dacdafd4
--- package-lock.json @@ -62,7 +62,7 @@ "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.14", "@walmart/pay-stub-miniapp": "0.9.35", - "@walmart/payrollsolution_miniapp": "0.130.43", + "@walmart/payrollsolution_miniapp": "^0.130.45", "@walmart/price-changes-mini-app": "1.8.7", "@walmart/profile-feature-app": "0.143.0", "@walmart/push-to-talk-mini-app": "1.9.22", @@ -5647,9 +5647,9 @@ } }, "node_modules/@walmart/payrollsolution_miniapp": { - "version": "0.130.43", - "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.130.43.tgz", - "integrity": "sha512-j8v30uKyvxAyCtEBzqM+700hSjLUwy7Ft7ggkI6jZ+IdmAToO8oOeSvG7NeFUM7Ym2rRT0olv6i8e9j81HO68w==", + "version": "0.130.45", + "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.130.45.tgz", + "integrity": "sha512-WD+gxW/DyYHfdWgpSFE9yYhYsJIQCQb4SgNFXkqQ4lXyMf4sERy3Q6QaSMoY5N/cGEkxUAjksOIVd5LLx6CTNg==", "dependencies": { "crypto-js": "^3.3.0" }, @@ -6204,7 +6204,7 @@ "@walmart/feedback-all-spark-miniapp": "0.9.9", "@walmart/functional-components": "1.0.34", "@walmart/gtp-shared-components": "^2.0.2", - "@walmart/payrollsolution_miniapp": "^0.130.4", + "@walmart/payrollsolution_miniapp": "0.130.4", "@walmart/react-native-collapsible": "^1.5.3", "@walmart/react-native-env": "0.2.0", "@walmart/react-native-logger": "1.28.0", @@ -25252,9 +25252,9 @@ } }, "@walmart/payrollsolution_miniapp": { - "version": "0.130.43", - "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.130.43.tgz", - "integrity": "sha512-j8v30uKyvxAyCtEBzqM+700hSjLUwy7Ft7ggkI6jZ+IdmAToO8oOeSvG7NeFUM7Ym2rRT0olv6i8e9j81HO68w==", + "version": "0.130.45", + "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.130.45.tgz", + "integrity": "sha512-WD+gxW/DyYHfdWgpSFE9yYhYsJIQCQb4SgNFXkqQ4lXyMf4sERy3Q6QaSMoY5N/cGEkxUAjksOIVd5LLx6CTNg==", "requires": { "crypto-js": "^3.3.0" } --- package.json @@ -104,7 +104,7 @@ "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.14", "@walmart/pay-stub-miniapp": "0.9.35", - "@walmart/payrollsolution_miniapp": "0.130.43", + "@walmart/payrollsolution_miniapp": "0.130.45", "@walmart/price-changes-mini-app": "1.8.7", "@walmart/profile-feature-app": "0.143.0", "@walmart/push-to-talk-mini-app": "1.9.22",
bump version
bump version
3d88eafcbc433e70a90d31c7104dad76124a2060
--- package.json @@ -159,7 +159,7 @@ "@walmart/walmart-fiscal-week": "^0.3.6", "@walmart/welcomeme-mini-app": "1.0.10", "@walmart/wfm-ui": "2.4.0", - "@walmart/wm-plus-mini-app": "1.4.4", + "@walmart/wm-plus-mini-app": "1.5.1", "@walmart/wmconnect-mini-app": "2.24.0", "axios": "~1.6.0", "axios-cache-adapter": "patch:axios-cache-adapter@npm%3A2.7.3#~/.yarn/patches/axios-cache-adapter-npm-2.7.3-26c357b785.patch", --- yarn.lock @@ -7377,7 +7377,7 @@ __metadata: "@walmart/walmart-fiscal-week": "npm:^0.3.6" "@walmart/welcomeme-mini-app": "npm:1.0.10" "@walmart/wfm-ui": "npm:2.4.0" - "@walmart/wm-plus-mini-app": "npm:1.4.4" + "@walmart/wm-plus-mini-app": "npm:1.5.1" "@walmart/wmconnect-mini-app": "npm:2.24.0" adaptive-expressions: "npm:^4.13.5" adaptivecards-templating: "npm:^2.1.0" @@ -8637,19 +8637,16 @@ __metadata: languageName: node linkType: hard -"@walmart/wm-plus-mini-app@npm:1.4.4": - version: 1.4.4 - resolution: "@walmart/wm-plus-mini-app@npm:1.4.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwm-plus-mini-app%2F-%2Fwm-plus-mini-app-1.4.4.tgz" +"@walmart/wm-plus-mini-app@npm:1.5.1": + version: 1.5.1 + resolution: "@walmart/wm-plus-mini-app@npm:1.5.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwm-plus-mini-app%2F-%2F%40walmart%2Fwm-plus-mini-app-1.5.1.tgz" peerDependencies: "@walmart/allspark-foundation": ">=6.0.0" expo: 50.0.17 expo-image: 1.5.2 react: "*" react-native: "*" - dependenciesMeta: - "@walmart/me-at-walmart": - built: false - checksum: 10c0/332cca3d705487af8556f4f4e31c1da46896924a94a1e64edfdf73afba3a118b7996dbc6b242dc6347824bace9e3b52bd79b5b15e54d14b950e73972bbd8b2fb + checksum: 10c0/f21d8dc53a38ab27e17aee2dcef19dc429336addfde7e688c77b35e9784150524dbab6fdf87ac565ea1fcd31a058abbcccf98b117c9f93739144eef801f17bd2 languageName: node linkType: hard
feat(profile): CEWMPLUS-115039 update wmplus miniapp to 1.5.1 (#4001)
feat(profile): CEWMPLUS-115039 update wmplus miniapp to 1.5.1 (#4001) Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com>
945537373075de90bed31fc518b7061a1742ca0b
--- package.json @@ -89,7 +89,7 @@ "@walmart/exception-mini-app": "0.42.1", "@walmart/facilities-management-miniapp": "0.2.2", "@walmart/feedback-all-spark-miniapp": "0.6.0", - "@walmart/financial-wellbeing-feature-app": "1.0.25", + "@walmart/financial-wellbeing-feature-app": "1.0.29", "@walmart/functional-components": "2.0.6", "@walmart/gta-react-native-calendars": "0.0.15", "@walmart/gtp-shared-components": "1.8.9", @@ -102,8 +102,8 @@ "@walmart/metrics-mini-app": "0.9.12", "@walmart/mod-flex-mini-app": "1.1.3", "@walmart/moment-walmart": "1.0.4", - "@walmart/pay-stub-miniapp": "0.7.6", - "@walmart/payrollsolution_miniapp": "0.126.7", + "@walmart/pay-stub-miniapp": "0.7.7", + "@walmart/payrollsolution_miniapp": "0.126.8", "@walmart/price-changes-mini-app": "1.4.11", "@walmart/profile-feature-app": "0.0.58", "@walmart/push-to-talk-mini-app": "1.8.9",
updated to v1.0.29
updated to v1.0.29
8f3f8d6b61a369438e0aa3622bc8ad1238442bb5
--- src/env/useLegacyEnvSetup.ts @@ -0,0 +1,21 @@ +import {useEffect} from 'react'; +import {IAllsparkEnvConfig} from '@walmart/core-services-allspark'; +import {useEnvironment} from '@walmart/core-services/Environment'; +import {setSharedConfig} from '@walmart/react-native-env'; +import {reducerManager} from '@walmart/redux-store'; + +export const useLegacyEnvSetup = () => { + const env = useEnvironment<IAllsparkEnvConfig>(); + + useEffect(() => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const {extend, ...restEnv} = env; + + setSharedConfig(restEnv); + const envReducer = (state: any = restEnv) => state; + reducerManager.addReducer('envConfig', envReducer); + + return () => reducerManager.removeReducer('envConfig'); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []); +}; --- src/navigation/index.tsx @@ -1,19 +1,11 @@ -import React, {useEffect, useState} from 'react'; +import React, {useEffect} from 'react'; import {useSelector} from 'react-redux'; import {createStackNavigator, TransitionPresets} from '@react-navigation/stack'; -import {reducerManager} from '@walmart/redux-store'; import {Header} from '@walmart/ui-components'; import WelcomeMeMiniApp from '@walmart/welcomeme-mini-app'; import SplashScreen from 'react-native-splash-screen'; -import {setSharedConfig} from '@walmart/react-native-env'; -import {IAllsparkEnvConfig} from '@walmart/core-services-allspark'; -import {useEnvironment} from '@walmart/core-services/Environment'; -import {useTranslationInstance} from '@walmart/core-services/Translations'; - -import {enUS} from '../translations/en-US'; -import {esMX} from '../translations/es-MX'; -import {getDeviceLanguage, persistLanguage} from '../translations/utils'; + import { WelcomeScreen, LocationScreen, @@ -33,6 +25,7 @@ import { PERMISSION_WELCOME_SCREEN, } from '../permissions/constants'; import {TranslationSetupGuard} from '../translations'; +import {useLegacyEnvSetup} from '../env/useLegacyEnvSetup'; import {UserRootNav} from './UserRootNav'; import {AlertModal} from './AlertModal'; @@ -49,22 +42,9 @@ import {RootStackMap} from './types'; const RootStack = createStackNavigator<RootStackMap>(); export const RootNav = () => { - const env = useEnvironment<IAllsparkEnvConfig>(); const isAppAccessible = useSelector(getIsAppAccessible); - // Environment setup for backwards compatability - useEffect(() => { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - const {extend, ...restEnv} = env; - - // @todo - Remove once mini apps no longer depend on these. - setSharedConfig(restEnv); - const envReducer = (state: any = restEnv) => state; - reducerManager.addReducer('envConfig', envReducer); - - return () => reducerManager.removeReducer('envConfig'); - // eslint-disable-next-line react-hooks/exhaustive-deps - }, []); + useLegacyEnvSetup(); useEffect(() => { SplashScreen.hide();
Add useLegacyEnvSetup
Add useLegacyEnvSetup
c48271192b9793c9637c5337e1ab421c36867fe7
--- src/navigation/AssociateHallwayNav/SideMenuContent.tsx @@ -45,16 +45,6 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps< const [navConfig, setNavConfig] = useState(undefined); const defaultConfig = [ - { - menuType: 'SUBMENU', - icon: 'barcode', - title: translate('menu.itemInfo'), - enabled: true, - action: { - type: 'NAVIGATE', - value: 'itemInfo', - }, - }, { menuType: 'SUBMENU', icon: 'settings', @@ -93,8 +83,7 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps< } else { StatusBar.setBarStyle('light-content', true); if (remoteNavConfig?.length && !navConfig) { - // TODO: revert back to setNavConfig(remoteNavConfig); - setNavConfig(defaultConfig); + setNavConfig(remoteNavConfig); } } // eslint-disable-next-line react-hooks/exhaustive-deps @@ -171,4 +160,4 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps< /> </SafeAreaView> ); -}; +}; \ No newline at end of file
remote config
remote config
6845e498de12c5647bdabf0a8e316d14e2b39fa0
--- package.json @@ -37,7 +37,7 @@ "test": "jest --no-watchman", "verifyBranchName": "bash ./scripts/verifyBranchName.sh", "uploadBlobToAzure": "node ./scripts/dependencies-map/src/upload-to-azure/upload-to-azure.js", - "buildDependenciesMap": "node ./scripts/dependencies-map/src/deps-crawler/index.js -- -f -dm -dc path='./scripts/dependencies-map/config/deps-source.json' chunk_size=20", + "buildDependenciesMap": "node ./scripts/dependencies-map/src/deps-crawler/index.js -- -f -dm -dc path='./scripts/dependencies-map/src/config/deps-source.json' chunk_size=20", "android": "expo run:android", "ios": "expo run:ios" }, @@ -403,4 +403,4 @@ "react-native-calendars": "^1.1291.0", "react-native-modal@npm:^13.0.1": "patch:react-native-modal@npm%3A13.0.1#~/.yarn/patches/react-native-modal-npm-13.0.1-f1a75332f0.patch" } -} \ No newline at end of file +}
fix deps-crawler path
fix deps-crawler path
181d528cd7ccbf874edf6704380e00aab7a657f3
--- core/__tests__/__mocks__/@walmart/me-at-walmart-athena-queries.js --- core/__tests__/home/components/TaskCard/TaskClockStatusTeamCard2Test.tsx @@ -3,7 +3,7 @@ import {useTranslation} from 'react-i18next'; import {act, create, ReactTestRenderer} from 'react-test-renderer'; import {useNavigation} from '@react-navigation/native'; import {LinkButton} from '@walmart/gtp-shared-components'; -import {useGetTeamByIdHomeQuery} from '@walmart/me-at-walmart-common'; +import {useGetTeamByIdHomeQuery} from '@walmart/me-at-walmart-athena-queries'; import {AllsparkReduxStore} from '@walmart/allspark-foundation/Redux'; import {User, UserActionCreators} from '@walmart/allspark-foundation/User'; --- core/__tests__/settings/privacy/PrivacyPreferencesTest.tsx @@ -1,20 +1,22 @@ import React from 'react'; import {render} from '@testing-library/react-native'; -import { - PrivacyPreferences, - onUpdateCompleted, -} from '../../../src/settings/privacy/PrivacyPreferences'; import {useTranslation} from 'react-i18next'; import {useSelector} from 'react-redux'; -import {useUpsertAssociatePreferenceMutation} from '@walmart/me-at-walmart-common'; - +import { + useUpsertAssociatePreferenceMutation, + UpsertAssociatePreferenceMutation, +} from '@walmart/me-at-walmart-athena-queries'; import {User} from '@walmart/redux-store'; import { UserActionCreators, UserSelectors, } from '@walmart/allspark-foundation/User'; import {AllsparkReduxStore} from '@walmart/allspark-foundation/Redux'; -import {UpsertAssociatePreferenceMutation} from '@walmart/me-at-walmart-common'; + +import { + PrivacyPreferences, + onUpdateCompleted, +} from '../../../src/settings/privacy/PrivacyPreferences'; const mockUseSelector = useSelector as jest.Mock; const mockMutation = useUpsertAssociatePreferenceMutation as jest.Mock; --- core/src/home/components/TaskCard/TaskClockStatusTeamCard2.tsx @@ -8,7 +8,7 @@ import {getVersion} from 'react-native-device-info'; import {SolidCard, Spinner} from '@walmart/gtp-shared-components'; import {useEnvironment} from '@walmart/allspark-foundation/Environment'; import {UserSelectors} from '@walmart/allspark-foundation/User'; -import {useGetTeamByIdHomeQuery} from '@walmart/me-at-walmart-common'; +import {useGetTeamByIdHomeQuery} from '@walmart/me-at-walmart-athena-queries'; import {HomeStackNavigationProp} from '../../../navigation/AssociateHallwayNav/types'; import {logWMTelemetryTouchComponentEvent} from '../../logger/Logger'; --- core/src/settings/privacy/PrivacyPreferences.tsx @@ -8,7 +8,7 @@ import {Heading, Body, colors} from '@walmart/gtp-shared-components'; import { UpsertAssociatePreferenceMutation, useUpsertAssociatePreferenceMutation, -} from '@walmart/me-at-walmart-common'; +} from '@walmart/me-at-walmart-athena-queries'; import { UserActionCreators, UserSelectors,
fix: query imports were from incorrect library
fix: query imports were from incorrect library
3b79433af7e43dde048633cf8e852fd07a8b92be
--- packages/allspark-foundation-hub/src/SupplyChain/Hub/SiteHubDashboard.tsx @@ -101,6 +101,8 @@ export const SiteHubDashboard = ({ name, widgets }: HubDashboardProps) => { const { t } = useAllsparkTranslation(FEATURE_ID); const originalSiteId = useSelector(UserSelectors.getHomeSite); + const associateId = useSelector(UserSelectors.getUserId) as string; + const isNotPartOfRoster = currentSiteId && originalSiteId && currentSiteId !== originalSiteId; @@ -122,7 +124,9 @@ export const SiteHubDashboard = ({ name, widgets }: HubDashboardProps) => { }, [selectedTeamIds]); // this fires when switcher value changes const checkPopoverStatus = useCallback(async () => { - const isFirstTime = await AllsparkLocalStorage.get(POPOVER_KEY); + const isFirstTime = await AllsparkLocalStorage.get( + POPOVER_KEY + associateId + ); if (!isFirstTime) { setShow(true); } @@ -261,7 +265,7 @@ export const SiteHubDashboard = ({ name, widgets }: HubDashboardProps) => { ); const handlePopoverClose = useCallback(async () => { - await AllsparkLocalStorage.set(POPOVER_KEY, 'true'); + await AllsparkLocalStorage.set(POPOVER_KEY + associateId, 'true'); setShow(false); }, []); @@ -333,7 +337,7 @@ export const SiteHubDashboard = ({ name, widgets }: HubDashboardProps) => { <Popover content={"Tap here to change the team you're viewing."} handleClose={handlePopoverClose} - showPopover={false} //TODO: Need to update logic + showPopover={show} UNSAFE_style={{ width: '60%' }} /> )}
feat(ui): updated logic for callout show
feat(ui): updated logic for callout show
242321d63d5e0c6027bb30681f26081088430b49
--- yarn.lock @@ -1540,17 +1540,7 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.13, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.25.2, @babel/types@npm:^7.26.10, @babel/types@npm:^7.27.1, @babel/types@npm:^7.27.3, @babel/types@npm:^7.27.6, @babel/types@npm:^7.28.0, @babel/types@npm:^7.3.3": - version: 7.28.0 - resolution: "@babel/types@npm:7.28.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40babel%2Ftypes%2F-%2Ftypes-7.28.0.tgz" - dependencies: - "@babel/helper-string-parser": "npm:^7.27.1" - "@babel/helper-validator-identifier": "npm:^7.27.1" - checksum: 10c0/7ca8521bf5e2d2ed4db31176efaaf94463a6b7a4d16dcc60e34e963b3596c2ecadb85457bebed13a9ee9a5829ef5f515d05b55a991b6a8f3b835451843482e39 - languageName: node - linkType: hard - -"@babel/types@npm:^7.19.0, @babel/types@npm:^7.2.0, @babel/types@npm:^7.24.7": +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.13, @babel/types@npm:^7.19.0, @babel/types@npm:^7.2.0, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.24.7, @babel/types@npm:^7.25.2, @babel/types@npm:^7.26.10, @babel/types@npm:^7.27.1, @babel/types@npm:^7.27.3, @babel/types@npm:^7.27.6, @babel/types@npm:^7.28.0, @babel/types@npm:^7.3.3": version: 7.28.2 resolution: "@babel/types@npm:7.28.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40babel%2Ftypes%2F-%2Ftypes-7.28.2.tgz" dependencies: @@ -11733,7 +11723,7 @@ __metadata: languageName: node linkType: hard -"compression@npm:^1.7.1": +"compression@npm:^1.7.1, compression@npm:^1.7.4": version: 1.8.1 resolution: "compression@npm:1.8.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fcompression%2F-%2Fcompression-1.8.1.tgz" dependencies: @@ -11748,21 +11738,6 @@ __metadata: languageName: node linkType: hard -"compression@npm:^1.7.4": - version: 1.8.0 - resolution: "compression@npm:1.8.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fcompression%2F-%2Fcompression-1.8.0.tgz" - dependencies: - bytes: "npm:3.1.2" - compressible: "npm:~2.0.18" - debug: "npm:2.6.9" - negotiator: "npm:~0.6.4" - on-headers: "npm:~1.0.2" - safe-buffer: "npm:5.2.1" - vary: "npm:~1.1.2" - checksum: 10c0/804d3c8430939f4fd88e5128333f311b4035f6425a7f2959d74cfb5c98ef3a3e3e18143208f3f9d0fcae4cd3bcf3d2fbe525e0fcb955e6e146e070936f025a24 - languageName: node - linkType: hard - "concat-map@npm:0.0.1": version: 0.0.1 resolution: "concat-map@npm:0.0.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fconcat-map%2F-%2Fconcat-map-0.0.1.tgz" @@ -25953,7 +25928,7 @@ __metadata: languageName: node linkType: hard -"yaml@npm:^2.2.1": +"yaml@npm:^2.2.1, yaml@npm:^2.3.1": version: 2.8.1 resolution: "yaml@npm:2.8.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fyaml%2F-%2Fyaml-2.8.1.tgz" bin: @@ -25962,15 +25937,6 @@ __metadata: languageName: node linkType: hard -"yaml@npm:^2.3.1": - version: 2.8.0 - resolution: "yaml@npm:2.8.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fyaml%2F-%2Fyaml-2.8.0.tgz" - bin: - yaml: bin.mjs - checksum: 10c0/f6f7310cf7264a8107e72c1376f4de37389945d2fb4656f8060eca83f01d2d703f9d1b925dd8f39852a57034fafefde6225409ddd9f22aebfda16c6141b71858 - languageName: node - linkType: hard - "yargs-parser@npm:^18.1.2": version: 18.1.3 resolution: "yargs-parser@npm:18.1.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fyargs-parser%2F-%2Fyargs-parser-18.1.3.tgz"
chore(dedupe): fixed duplicate versions
chore(dedupe): fixed duplicate versions
1dd9be516b4b23b7d10f1a25eb15b9425eb4435b
--- package.json @@ -111,7 +111,7 @@ "@walmart/gtp-shared-components": "2.2.3-rc.1", "@walmart/impersonation-mini-app": "1.20.8", "@walmart/ims-print-services-ui": "2.12.0", - "@walmart/inbox-mini-app": "0.95.2", + "@walmart/inbox-mini-app": "0.95.3", "@walmart/iteminfo-mini-app": "7.15.11", "@walmart/learning-mini-app": "20.0.32", "@walmart/manager-approvals-miniapp": "0.2.4", --- yarn.lock @@ -6251,9 +6251,9 @@ __metadata: languageName: node linkType: hard -"@walmart/inbox-mini-app@npm:0.95.2": - version: 0.95.2 - resolution: "@walmart/inbox-mini-app@npm:0.95.2" +"@walmart/inbox-mini-app@npm:0.95.3": + version: 0.95.3 + resolution: "@walmart/inbox-mini-app@npm:0.95.3" dependencies: "@walmart/moment-walmart": "npm:^1.0.4" "@walmart/walmart-fiscal-week": "npm:^0.3.6" @@ -6266,7 +6266,7 @@ __metadata: lodash: ">=4.17.20" prop-types: 15.7.2 typescript: ^4.0.2 - checksum: 10c0/c1503764919326c7ac20d8d22e88a38d1b57e45cd71b01e2f880328f3cc317896e7ab62a4bb13febfa868fa9a9e6ec8fc7c3d5a7ee88d47131d4a8b957177678 + checksum: 10c0/72cd7c7991d43cceedc4041e78ae875752ee9b213c6d638b5a2da4e52681c6707617dd3dfddd503ae54b735458155ea44eace39d9d6bc52ea7c20059d8271dae languageName: node linkType: hard @@ -7908,7 +7908,7 @@ __metadata: "@walmart/gtp-shared-components": "npm:2.2.3-rc.1" "@walmart/impersonation-mini-app": "npm:1.20.8" "@walmart/ims-print-services-ui": "npm:2.12.0" - "@walmart/inbox-mini-app": "npm:0.95.2" + "@walmart/inbox-mini-app": "npm:0.95.3" "@walmart/iteminfo-mini-app": "npm:7.15.11" "@walmart/learning-mini-app": "npm:20.0.32" "@walmart/manager-approvals-miniapp": "npm:0.2.4"
inbox version update
inbox version update
0e8a2d69ec2b802bd20424fbd13c25e056aec100
--- 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.8", + "@walmart/copilot-mini-app": "3.59.9", "@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.8", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.59.8.tgz", - "integrity": "sha512-7DhiemAy96369lQMn7nThRob5vd9AmYFREB1G6ZnqdGKTc2qQMwkH073+STTdPVnpsMyE29txxAvtwJuyTm1zQ==", + "version": "3.59.9", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.59.9.tgz", + "integrity": "sha512-KqgXRrFMCyTGxbDZGV4wkgEtFuBQ1IYyc6FQnj6Va8bZ2jSS+PzGy1Y1wjhcqm0Fp9WibPivefpSMffkdeQVxw==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -9879,12 +9879,6 @@ "big-integer": "^1.6.48" } }, - "node_modules/@walmart/texting-mini-app": { - "version": "2.1.5", - "resolved": "https://npme.walmart.com/@walmart/texting-mini-app/-/texting-mini-app-2.1.5.tgz", - "integrity": "sha512-2nKMhz2s8u4i3fjkrp6LLuSYr0njLx6YzSUxjijtMoLrnWEYAjP4Madu8bqitrdynx0AqR+HhC31Ly9SeNm+hg==", - "hasInstallScript": true - }, "node_modules/@walmart/time-clock-mini-app": { "version": "2.338.1", "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.338.1.tgz", @@ -33186,9 +33180,9 @@ } }, "@walmart/copilot-mini-app": { - "version": "3.59.8", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.59.8.tgz", - "integrity": "sha512-7DhiemAy96369lQMn7nThRob5vd9AmYFREB1G6ZnqdGKTc2qQMwkH073+STTdPVnpsMyE29txxAvtwJuyTm1zQ==" + "version": "3.59.9", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.59.9.tgz", + "integrity": "sha512-KqgXRrFMCyTGxbDZGV4wkgEtFuBQ1IYyc6FQnj6Va8bZ2jSS+PzGy1Y1wjhcqm0Fp9WibPivefpSMffkdeQVxw==" }, "@walmart/core-services": { "version": "2.3.2", @@ -33554,11 +33548,6 @@ "big-integer": "^1.6.48" } }, - "@walmart/texting-mini-app": { - "version": "2.1.5", - "resolved": "https://npme.walmart.com/@walmart/texting-mini-app/-/texting-mini-app-2.1.5.tgz", - "integrity": "sha512-2nKMhz2s8u4i3fjkrp6LLuSYr0njLx6YzSUxjijtMoLrnWEYAjP4Madu8bqitrdynx0AqR+HhC31Ly9SeNm+hg==" - }, "@walmart/time-clock-mini-app": { "version": "2.338.1", "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.338.1.tgz", --- 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.8", + "@walmart/copilot-mini-app": "3.59.9", "@walmart/core-services": "~2.3.0", "@walmart/core-services-allspark": "~2.13.11", "@walmart/core-utils": "~2.0.5", @@ -338,4 +338,4 @@ "pre-push": "run-p solidarity coverage" } } -} \ No newline at end of file +}
chore: bump copilot@3.59.9
chore: bump copilot@3.59.9
5302e7d1452032bfbb01a511ba2c018c537ca263
--- .yarn/patches/react-native-npm-0.73.7-7f2047866d.patch @@ -1,13 +0,0 @@ -diff --git a/third-party-podspecs/boost.podspec b/third-party-podspecs/boost.podspec -index 8e924afd367f1b53031daf164bd78cce7908f56e..3950fce7cbb18d9c58823b5913c245848d7023fe 100644 ---- a/third-party-podspecs/boost.podspec -+++ b/third-party-podspecs/boost.podspec -@@ -10,7 +10,7 @@ Pod::Spec.new do |spec| - spec.homepage = 'http://www.boost.org' - spec.summary = 'Boost provides free peer-reviewed portable C++ source libraries.' - spec.authors = 'Rene Rivera' -- spec.source = { :http => 'https://archives.boost.io/release/1.83.0/source/boost_1_83_0.tar.bz2', -+ spec.source = { :http => 'https://boostorg.jfrog.io/artifactory/main/release/1.83.0/source/boost_1_83_0.tar.bz2', - :sha256 => '6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e' } - - # Pinning to the same version as React.podspec.
fix: removing patch for boost
fix: removing patch for boost
3f0491b0ced55c2a9f794f6d581b69014880543a
--- core/src/navigation/USHallway/AssociateHallwayNav/MainStackNav.tsx @@ -13,7 +13,7 @@ import {AvailableSurveysNav} from '@walmart/associate-listening-mini-app'; import {AVPNav, AVP_NAV_SCREEN_NAME} from '@walmart/avp-feature-app'; import BackroomMiniApp from '@walmart/backroom-mini-app'; import {EmergencyBannerScreen} from '@walmart/emergency-mini-app'; -import {ExceptionMiniApp} from '@walmart/exception-mini-app'; +import ExceptionMiniApp from '@walmart/exception-mini-app'; import { FeedbackMiniApp, ShareConcernScreen,
[Drop28-fixit] removing unnecessary added change while fixing conflicts
[Drop28-fixit] removing unnecessary added change while fixing conflicts
187e122fd1c2e287fafda33809dd58dffb2b00ef
--- package-lock.json @@ -65,7 +65,7 @@ "@walmart/ims-print-services-ui": "2.8.0", "@walmart/inbox-mini-app": "0.90.0", "@walmart/iteminfo-mini-app": "7.8.3", - "@walmart/learning-mini-app": "18.0.3", + "@walmart/learning-mini-app": "18.0.5", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/metrics-mini-app": "0.18.6", "@walmart/mod-flex-mini-app": "1.14.6", @@ -9215,14 +9215,10 @@ } }, "node_modules/@walmart/learning-mini-app": { - "version": "18.0.3", - "resolved": "https://npme.walmart.com/@walmart/learning-mini-app/-/learning-mini-app-18.0.3.tgz", - "integrity": "sha512-Jy7+QZeSmTY7OiiixaCL02Zoj9WfZh3PnA7e17Ptk51vgLROnp6JUkvdD8X9EyuPGc5lMmb+zXRIKEVRyf/ajg==", + "version": "18.0.5", + "resolved": "https://npme.walmart.com/@walmart/learning-mini-app/-/learning-mini-app-18.0.5.tgz", + "integrity": "sha512-CXVWO2BI9lHTHXnws1vaLRv7UIrrxkZRkI0lKgu2BM6P93tbCRnQSq+liQHGOT0Gb1wmjhtuuIPUvXlJSGz4Ow==", "hasInstallScript": true, - "dependencies": { - "@livingdesign/tokens": "0.63.0", - "@walmart/me-at-homeoffice-ui-components": "1.2.140" - }, "peerDependencies": { "@atmt/feedback-component-native": "^8.0.0", "@react-native-firebase/analytics": "17.4.2", @@ -9251,9 +9247,13 @@ "@walmart/react-native-sumo-sdk": "^2.6.0", "@walmart/redux-store": "~3.1.3", "@walmart/time-clock-mini-app": "2.175.2", - "@walmart/ui-components": "1.9.0", + "@walmart/ui-components": "1.15.6", "@walmart/wfm-ui": "0.2.25", "base-64": "^1.0.0", + "expo": "49.0.10", + "expo-av": "13.4.1", + "expo-image": "~1.3.5", + "expo-sharing": "~11.7.0", "graphql": "^16.1.0", "i18next": "^21.6.3", "javascript-time-ago": "^2.3.4", @@ -9267,7 +9267,6 @@ "react-native-app-auth": "^6.4.3", "react-native-background-timer": "^2.4.1", "react-native-exception-handler": "^2.10.10", - "react-native-fast-image": "^8.5.11", "react-native-flipper": "0.182.0", "react-native-gesture-handler": "^2.13.1", "react-native-get-random-values": "^1.7.0", @@ -9321,26 +9320,6 @@ "reselect": "^4.1.0" } }, - "node_modules/@walmart/me-at-homeoffice-ui-components": { - "version": "1.2.140", - "resolved": "https://npme.walmart.com/@walmart/me-at-homeoffice-ui-components/-/me-at-homeoffice-ui-components-1.2.140.tgz", - "integrity": "sha512-d56SQqhlcpvXjWtMXz7NSrsGvoXU2Oae0gl9OiZ6v/3AL0X+AY84wB9TXRXqrp+4/pw+lPv3lbdJaOdN+z5gSg==", - "license": "ISC", - "peerDependencies": { - "@react-navigation/elements": "^1.3.17", - "@react-navigation/stack": ">=6.1.0", - "@walmart/gtp-shared-components": ">=2.0.2", - "@walmart/redux-store": "^3.1.3", - "javascript-time-ago": ">=2.3.4", - "react-native-background-timer": ">=2.4.1", - "react-native-device-info": "^10.3.0", - "react-native-drop-shadow": "^0.0.6", - "react-native-hyperlink": ">=0.0.19", - "react-native-modal": "^11.6.1", - "react-native-safe-area-context": ">=3.1.3", - "react-native-webview": "^11.23.1" - } - }, "node_modules/@walmart/me-at-walmart-athena-queries": { "version": "1.7.3", "resolved": "https://npme.walmart.com/@walmart/me-at-walmart-athena-queries/-/me-at-walmart-athena-queries-1.7.3.tgz", @@ -33464,24 +33443,15 @@ "integrity": "sha512-BFN+Mi5L4lcrCAEhJ9twaujNGAjanfAbsdhh0M9YlniiTbASbeBdxKwYlkqkecBP/tEJVb4YQx7tjj9t1v9Rsg==" }, "@walmart/learning-mini-app": { - "version": "18.0.3", - "resolved": "https://npme.walmart.com/@walmart/learning-mini-app/-/learning-mini-app-18.0.3.tgz", - "integrity": "sha512-Jy7+QZeSmTY7OiiixaCL02Zoj9WfZh3PnA7e17Ptk51vgLROnp6JUkvdD8X9EyuPGc5lMmb+zXRIKEVRyf/ajg==", - "requires": { - "@livingdesign/tokens": "0.63.0", - "@walmart/me-at-homeoffice-ui-components": "1.2.140" - } + "version": "18.0.5", + "resolved": "https://npme.walmart.com/@walmart/learning-mini-app/-/learning-mini-app-18.0.5.tgz", + "integrity": "sha512-CXVWO2BI9lHTHXnws1vaLRv7UIrrxkZRkI0lKgu2BM6P93tbCRnQSq+liQHGOT0Gb1wmjhtuuIPUvXlJSGz4Ow==" }, "@walmart/manager-approvals-miniapp": { "version": "0.2.4", "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.2.4.tgz", "integrity": "sha512-IjgpoS1xzZAm8jtEI5fpTqpwRHQXC8FORd2OpRD5vCpJ2QIKVUzhH3iCEhyjZSOWQ5rmc9miUxt5HGtLABYhTg==" }, - "@walmart/me-at-homeoffice-ui-components": { - "version": "1.2.140", - "resolved": "https://npme.walmart.com/@walmart/me-at-homeoffice-ui-components/-/me-at-homeoffice-ui-components-1.2.140.tgz", - "integrity": "sha512-d56SQqhlcpvXjWtMXz7NSrsGvoXU2Oae0gl9OiZ6v/3AL0X+AY84wB9TXRXqrp+4/pw+lPv3lbdJaOdN+z5gSg==" - }, "@walmart/me-at-walmart-athena-queries": { "version": "1.7.3", "resolved": "https://npme.walmart.com/@walmart/me-at-walmart-athena-queries/-/me-at-walmart-athena-queries-1.7.3.tgz", --- package.json @@ -106,7 +106,7 @@ "@walmart/ims-print-services-ui": "2.8.0", "@walmart/inbox-mini-app": "0.90.0", "@walmart/iteminfo-mini-app": "7.8.3", - "@walmart/learning-mini-app": "18.0.3", + "@walmart/learning-mini-app": "18.0.5", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/metrics-mini-app": "0.18.6", "@walmart/mod-flex-mini-app": "1.14.6",
feat: :sparkles: Bump learning mini app version to 18.0.5
feat: :sparkles: Bump learning mini app version to 18.0.5
7eb413006807721e13d0ab173a3207b46b7d8b4b
--- package-lock.json @@ -4440,8 +4440,8 @@ "integrity": "sha512-vL0+hmLX3mP3jXomwGL+kxp2aRLe002I+b+LL+wVbmOdRdXBvA7gbA5VJeRFkvaUQfU2SlRVLYJwv34HT9I8jw==" }, "@walmart/shelfavailability-mini-app": { - "version": "0.8.1", - "resolved": "https://npme.walmart.com/@walmart/shelfavailability-mini-app/-/shelfavailability-mini-app-0.8.1.tgz", + "version": "0.8.3", + "resolved": "https://npme.walmart.com/@walmart/shelfavailability-mini-app/-/shelfavailability-mini-app-0.8.3.tgz", "integrity": "sha512-nLKZDzRD/BxR3lUtz+q7bYk3kvXzarotfFTx2ad+Kb3vwGc/INXLpPBzECl0qwluvB0PUCr+La0XSGwojQvLiw==", "requires": { "@types/uuid": "^8.3.0", --- package.json @@ -100,7 +100,7 @@ "@walmart/refrigeration-alarms-mini-app": "1.29.0", "@walmart/schedule-mini-app": "0.11.0", "@walmart/settings-mini-app": "1.6.0", - "@walmart/shelfavailability-mini-app": "0.8.2", + "@walmart/shelfavailability-mini-app": "0.8.3", "@walmart/taskit-mini-app": "0.176.0-rc.0", "@walmart/time-clock-mini-app": "0.4.27", "@walmart/ui-components": "1.3.0-rc.10",
package.json and package-lock.json updated with the latest version of SA
package.json and package-lock.json updated with the latest version of SA
7c0bff2d728769814d86636e7e8e8a1d84aff26f
--- __tests__/navigation/AssociateHallwayNav/BannersTest.tsx @@ -1,9 +1,32 @@ import React from 'react'; import {create} from 'react-test-renderer'; -import {Banners} from '../../../src/navigation/AssociateHallwayNav/Banners'; +import { + Banners, + bannerSagas, + updateNetworkBanners, +} from '../../../src/navigation/AssociateHallwayNav/Banners'; +import {all, call, takeLatest} from 'redux-saga/effects'; +import {NetworkActionTypes} from '@walmart/allspark-foundation/Network'; +import {SettingsActionTypes} from '../../../src/settings/redux'; test('Banners', () => { const component = create(<Banners />); expect(component.toJSON()).toMatchSnapshot(); }); + +test('bannerSagas', () => { + const iterator = bannerSagas(); + expect(iterator.next().value).toEqual( + all([ + call(updateNetworkBanners), + takeLatest( + [ + NetworkActionTypes.STATE_CHANGED, + SettingsActionTypes.SHOW_CONNECTIVITY_WARNING, + ], + updateNetworkBanners, + ), + ]), + ); +}); --- __tests__/settings/dataSaver/sagasTest.ts @@ -1,5 +1,5 @@ import {User} from '@walmart/redux-store'; -import {all, call, debounce, put, select, takeLatest} from 'redux-saga/effects'; +import {all, call, put, select, takeLatest} from 'redux-saga/effects'; import { NetworkActionTypes, NetworkSelectors, @@ -221,7 +221,7 @@ test('dataSaverSagas', () => { expect(iterator.next().value).toEqual( all([ takeLatest(SettingsActionTypes.DATA_SAVER_CHANGE, onDataSaverChange), - debounce(100, NetworkActionTypes.STATE_CHANGED, onNetworkChange), + takeLatest(NetworkActionTypes.STATE_CHANGED, onNetworkChange), ]), ); }); --- src/navigation/AssociateHallwayNav/Banners.tsx @@ -1,6 +1,6 @@ import React from 'react'; import {select} from 'typed-redux-saga'; -import {all, call, debounce} from 'redux-saga/effects'; +import {all, call, takeLatest} from 'redux-saga/effects'; import {AllScreenBanner as EmergencyBanner} from '@walmart/emergency-mini-app'; import { @@ -19,6 +19,7 @@ import { getShowConnectivityWarning, } from '../../redux/SharedSelectors'; import {Logger} from '../../core/Logger'; +import {SettingsActionTypes} from '../../settings/redux.ts'; /** * This saga will add a banner to the top of the screen if the user is on a different site than the wifi @@ -86,7 +87,13 @@ export function* bannerSagas() { yield all([ call(updateNetworkBanners), createRestartableSaga( - debounce(500, NetworkActionTypes.STATE_CHANGED, updateNetworkBanners), + takeLatest( + [ + NetworkActionTypes.STATE_CHANGED, + SettingsActionTypes.SHOW_CONNECTIVITY_WARNING, + ], + updateNetworkBanners, + ), Logger.error, ), ]); --- src/settings/dataSaver/sagas.ts @@ -1,4 +1,4 @@ -import {all, call, takeLatest, select, put, debounce} from 'redux-saga/effects'; +import {all, call, takeLatest, select, put} from 'redux-saga/effects'; import {createRestartableSagas} from '@walmart/allspark-utils'; import { NetworkActionTypes, @@ -113,7 +113,7 @@ export function* dataSaverSagas() { yield all( createRestartableSagas([ takeLatest(SettingsActionTypes.DATA_SAVER_CHANGE, onDataSaverChange), - debounce(100, NetworkActionTypes.STATE_CHANGED, onNetworkChange), + takeLatest(NetworkActionTypes.STATE_CHANGED, onNetworkChange), ]), ); }
update data saver settings
update data saver settings
2e900e467fc41f59251092a725ff5a59021b66e9
--- package-lock.json @@ -174,7 +174,7 @@ "react-native-wm-telemetry": "0.4.0", "react-native-wm-voice-text": "1.0.2", "react-redux": "^8.0.4", - "realm": "12.3.0", + "realm": "12.3.1", "redux": "^4.1.2", "redux-flipper": "^2.0.2", "redux-saga": "^1.2.0", @@ -24180,9 +24180,9 @@ "license": "BSD" }, "node_modules/realm": { - "version": "12.3.0", - "resolved": "https://npme.walmart.com/realm/-/realm-12.3.0.tgz", - "integrity": "sha512-qlWu8RpgGQhCllwutGZUJ+B37AF+7RNNXlyo5SftZoQFiTKVlmhN5w6B2fBmTd7R9J7Tw+lJcYUbvCZuZ4es0w==", + "version": "12.3.1", + "resolved": "https://npme.walmart.com/realm/-/realm-12.3.1.tgz", + "integrity": "sha512-SZOpIf5O9aJ8jwSmeDv9OFYRaTuIlH2EpsXLkONgehJ7KZNArsRUrK21p+YSKPovQHsGN7yAUW3e/kssq8T2XA==", "hasInstallScript": true, "license": "apache-2.0", "dependencies": { @@ -42837,9 +42837,9 @@ "integrity": "sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg==" }, "realm": { - "version": "12.3.0", - "resolved": "https://npme.walmart.com/realm/-/realm-12.3.0.tgz", - "integrity": "sha512-qlWu8RpgGQhCllwutGZUJ+B37AF+7RNNXlyo5SftZoQFiTKVlmhN5w6B2fBmTd7R9J7Tw+lJcYUbvCZuZ4es0w==", + "version": "12.3.1", + "resolved": "https://npme.walmart.com/realm/-/realm-12.3.1.tgz", + "integrity": "sha512-SZOpIf5O9aJ8jwSmeDv9OFYRaTuIlH2EpsXLkONgehJ7KZNArsRUrK21p+YSKPovQHsGN7yAUW3e/kssq8T2XA==", "requires": { "bson": "^4.7.2", "debug": "^4.3.4", --- package.json @@ -215,7 +215,7 @@ "react-native-wm-telemetry": "0.4.0", "react-native-wm-voice-text": "1.0.2", "react-redux": "^8.0.4", - "realm": "12.3.0", + "realm": "12.3.1", "redux": "^4.1.2", "redux-flipper": "^2.0.2", "redux-saga": "^1.2.0",
realm upgrade.
realm upgrade.
351c17699999e036b331a32a38be37b7a5487fa7
--- packages/allspark-utils/src/Layout.tsx @@ -10,6 +10,7 @@ import { AnyObject } from './types'; export type LayoutColumnConfig = { componentId: string; + component?: string; width?: number; }; @@ -48,8 +49,9 @@ export const Layout = <P extends AnyObject>(props: LayoutProps<P>) => { {layout.map((row, rowIndex) => ( <View style={styles.row} key={`${rowIndex}-${row.length}`}> {row.map((column, colIndex) => { - const { componentId = '', width } = column; - const Component = config[componentId]; + const { componentId, component, width } = column; + const id = componentId || component || ''; + const Component = config[id]; if (!Component) { return null;
fix: layout component did not account for old format
fix: layout component did not account for old format
73368420af4a3e4fb0a6e01b0e76eb198e08eb2e
--- package.json @@ -93,7 +93,7 @@ "@walmart/react-native-logger": "^1.28.0", "@walmart/react-native-shared-navigation": "^0.4.0", "@walmart/react-native-sumo-sdk": "2.1.0", - "@walmart/redux-store": "^1.1.24", + "@walmart/redux-store": "1.1.24", "@walmart/schedule-mini-app": "0.6.0", "@walmart/settings-mini-app": "1.3.9", "@walmart/shelfavailability-mini-app": "0.6.8", --- src/core/storeConfigInit.ts @@ -38,9 +38,7 @@ export function* updateHomeSiteInfo() { } } -// Working site can change on user update or impersonation. -// siteId should always match workingSite, but in some cases mini apps are only -// updating siteId. So checking it as fallback if workingSite is undefined. +// working site could have been changed on user update or impersonation export function* updateWorkingSiteInfo() { const workingSite: string = yield select(SiteSelectors.getUserWorkingSite); --- src/translations/en-US.ts @@ -188,7 +188,7 @@ export const enUS = { errorAction: 'Retry', }, storeInfo: { - title: 'Store information', + title: 'Your store', }, userInfoError: { title: 'User error', --- src/translations/es-MX.ts @@ -189,7 +189,7 @@ export const esMX = { errorAction: 'Retry', }, storeInfo: { - title: 'Store information', + title: 'Your store', }, userInfoError: { title: 'User error!',
Translation fix
Translation fix
cac6d9d2ab39a15b0d2c2c1e44a770b7bea2c2ae
--- packages/allspark-foundation/src/HubFeature/Hub/Container/utils.ts @@ -1,3 +1,11 @@ +import { Team } from '../../../User'; +import { + EMPTYPE_HOURLY, + EMPTYPE_SALARIED, + MANAGEMENT_TEAMID, + MANAGEMENT_TEAMLABEL, +} from '../../constant'; +import { teamImageIcon } from './mockData'; import { TeamWidgetMapping, ValidatedTeamWidgetMapping } from './types'; export const validateWidgets = (data: { @@ -27,3 +35,29 @@ export const validateWidgets = (data: { return validatedData; }; + +export const getDefaultTeamsForUserType = ( + empType?: string, + userTeams?: Team[] +) => { + const primaryTeam = userTeams?.[0]; + if (empType === EMPTYPE_SALARIED) { + return [ + { + teamId: MANAGEMENT_TEAMID, + teamLabel: MANAGEMENT_TEAMLABEL, + teamImage: teamImageIcon[MANAGEMENT_TEAMID], + }, + ]; + } else if (empType === EMPTYPE_HOURLY && primaryTeam) { + return [ + { + teamId: primaryTeam.teamId ?? '', + teamLabel: primaryTeam.teamName ?? '', + teamImage: primaryTeam.teamId ? teamImageIcon[primaryTeam.teamId] : '', + }, + ]; + } else { + return []; + } +}; --- packages/allspark-foundation/src/HubFeature/Hub/TeamSwitcher/index.tsx @@ -12,6 +12,7 @@ import { useDispatch, useSelector } from 'react-redux'; import { ManagerExperienceCreators } from '../../Redux/actions'; import { AllsparkNavigationClient } from '../../../Navigation'; import { UserSelectors } from '@walmart/allspark-foundation'; +import { getDefaultTeamsForUserType } from '../Container/utils'; export * from './types'; @@ -28,31 +29,6 @@ export const TeamSwitcher = ({ const TeamImage = useTeamHubImage(); const dispatch = useDispatch(); - const getDefaultTeamsForUser = useCallback(() => { - const primaryTeam = userTeams?.[0]; - if (empType === 'S') { - return [ - { - teamId: '1111111', - teamLabel: 'Management', - teamImage: teamImageIcon['1111111'], - }, - ]; - } else if (empType === 'H' && primaryTeam) { - return [ - { - teamId: primaryTeam.teamId ?? '', - teamLabel: primaryTeam.teamName ?? '', - teamImage: primaryTeam.teamId - ? teamImageIcon[primaryTeam.teamId] - : '', - }, - ]; - } else { - return []; - } - }, [empType, userTeams]); - const getTeamsData = useCallback(() => { const totalStore = { teamId: 'total', @@ -67,9 +43,9 @@ export const TeamSwitcher = ({ if (teamData.length > 0) { return [totalStore, myTeams, ...teamData]; } else { - return [totalStore, ...getDefaultTeamsForUser()]; + return [totalStore, ...getDefaultTeamsForUserType(empType, userTeams)]; } - }, [teamData, getDefaultTeamsForUser]); + }, [teamData, empType, userTeams]); useEffect(() => { if (!selectedTeam) { @@ -77,18 +53,12 @@ export const TeamSwitcher = ({ if (teamData.length > 0) { setSelectedTeam(teamDataPreference[0].teamLabel); } else { - const { teamId, teamLabel } = getDefaultTeamsForUser()[0]; - setSelectedTeam(teamLabel); - onTeamChange(teamId); + const defaultTeam = getDefaultTeamsForUserType(empType, userTeams)[0]; + setSelectedTeam(defaultTeam?.teamLabel); + onTeamChange(defaultTeam?.teamId); } } - }, [ - selectedTeam, - teamData, - getTeamsData, - getDefaultTeamsForUser, - onTeamChange, - ]); + }, [selectedTeam, teamData, empType, userTeams, getTeamsData, onTeamChange]); const handlePress = (teamId: string, teamLabel: string) => { setSelectedTeam(teamLabel); --- packages/allspark-foundation/src/HubFeature/constant.ts @@ -1,2 +1,6 @@ export const FEATURE_ID = 'managerExperience'; export const FEATURE_NAME = 'Manager Experience'; +export const EMPTYPE_SALARIED = 'S'; +export const EMPTYPE_HOURLY = 'H'; +export const MANAGEMENT_TEAMID = '1111111'; +export const MANAGEMENT_TEAMLABEL = 'Management';
chore(ui): team switcher default state - refactor code
chore(ui): team switcher default state - refactor code
2605e070d1b92fd641733fda02544dc261f07db8
--- __tests__/components/BottomNav.test.tsx @@ -74,7 +74,7 @@ describe('BottomNav components', () => { insets: { top: 0, right: 16, - bottom: 0, + bottom: 34, left: 16 } }); --- __tests__/components/__snapshots__/BottomNav.test.tsx.snap @@ -7,7 +7,6 @@ exports[`BottomNav components TabBarIcon renders the correct icon with color 1`] "alignItems": "center", "height": 40, "justifyContent": "center", - "marginTop": 2, "width": 40, } } @@ -21,11 +20,7 @@ exports[`BottomNav components TabBarIcon renders the correct icon with color 1`] exports[`BottomNav components TabBarLabel renders correctly when focused 1`] = ` <View - style={ - { - "marginTop": 7, - } - } + style={{}} > <Body color="blue100" @@ -39,11 +34,7 @@ exports[`BottomNav components TabBarLabel renders correctly when focused 1`] = ` exports[`BottomNav components TabBarLabel renders correctly when not focused 1`] = ` <View - style={ - { - "marginTop": 7, - } - } + style={{}} > <Body color="gray100" --- src/components/BottomNav.tsx @@ -49,11 +49,8 @@ const styles = StyleSheet.create({ width: 40, justifyContent: 'center', alignItems: 'center', - marginTop: 2, }, - tabBarLabelWrapper: { - marginTop: 7, - } + tabBarLabelWrapper: {} }); /** @@ -103,7 +100,8 @@ export const TabBarIcon = ({color, icon}: { export const useMyWalmartTabConfig = () => { const insets = useSafeAreaInsets(); - const tabBarHeight = TabBarBaseHeight + Math.max(insets.bottom, TabBarBottomPadding); + const bottomOffset = Math.max(insets.bottom, TabBarBottomPadding); + const tabBarHeight = TabBarBaseHeight + bottomOffset; return { options: { @@ -116,7 +114,7 @@ export const useMyWalmartTabConfig = () => { } as BottomTabNavigationOptions, insets: { ...insets, - bottom: 0, + bottom: bottomOffset, left: Math.max(insets.left, 16), right: Math.max(insets.right, 16), }
fix: adjust bottom nav styling
fix: adjust bottom nav styling
3a0443a7bbd2971de66b0b3416f5ca034314d3c2
--- package-lock.json @@ -65,7 +65,7 @@ "@walmart/ims-print-services-ui": "2.9.1", "@walmart/inbox-mini-app": "0.91.6", "@walmart/iteminfo-mini-app": "7.9.0", - "@walmart/learning-mini-app": "18.0.5", + "@walmart/learning-mini-app": "20.0.3", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/metrics-mini-app": "0.19.4", "@walmart/mod-flex-mini-app": "1.15.5", @@ -9181,9 +9181,9 @@ } }, "node_modules/@walmart/learning-mini-app": { - "version": "18.0.5", - "resolved": "https://npme.walmart.com/@walmart/learning-mini-app/-/learning-mini-app-18.0.5.tgz", - "integrity": "sha512-CXVWO2BI9lHTHXnws1vaLRv7UIrrxkZRkI0lKgu2BM6P93tbCRnQSq+liQHGOT0Gb1wmjhtuuIPUvXlJSGz4Ow==", + "version": "20.0.3", + "resolved": "https://npme.walmart.com/@walmart/learning-mini-app/-/learning-mini-app-20.0.3.tgz", + "integrity": "sha512-2wS3vI59tI1HOVdgNKF3P7HbsqmlbfkzQ8gLw5YkOAsbBWg5pOh+mOmY10HaoxNtq/gs6PhaviIbBO5drJzaWg==", "hasInstallScript": true, "peerDependencies": { "@atmt/feedback-component-native": "^8.0.0", @@ -9216,8 +9216,7 @@ "@walmart/ui-components": "1.15.6", "@walmart/wfm-ui": "0.2.25", "base-64": "^1.0.0", - "expo": "49.0.10", - "expo-av": "13.4.1", + "expo": "49.0.13", "expo-image": "~1.3.5", "expo-sharing": "~11.7.0", "graphql": "^16.1.0", @@ -33324,9 +33323,9 @@ "integrity": "sha512-vw7xC45WA62Odc3pvfwaoJYnDVW1eytiAoDNMEF6+8VwQ9ZPzpmmp0jOmfT1iglbQMe+Z/eZ9ZJ1FU86myczsw==" }, "@walmart/learning-mini-app": { - "version": "18.0.5", - "resolved": "https://npme.walmart.com/@walmart/learning-mini-app/-/learning-mini-app-18.0.5.tgz", - "integrity": "sha512-CXVWO2BI9lHTHXnws1vaLRv7UIrrxkZRkI0lKgu2BM6P93tbCRnQSq+liQHGOT0Gb1wmjhtuuIPUvXlJSGz4Ow==" + "version": "20.0.3", + "resolved": "https://npme.walmart.com/@walmart/learning-mini-app/-/learning-mini-app-20.0.3.tgz", + "integrity": "sha512-2wS3vI59tI1HOVdgNKF3P7HbsqmlbfkzQ8gLw5YkOAsbBWg5pOh+mOmY10HaoxNtq/gs6PhaviIbBO5drJzaWg==" }, "@walmart/manager-approvals-miniapp": { "version": "0.2.4", --- package.json @@ -106,7 +106,7 @@ "@walmart/ims-print-services-ui": "2.9.1", "@walmart/inbox-mini-app": "0.91.6", "@walmart/iteminfo-mini-app": "7.9.0", - "@walmart/learning-mini-app": "18.0.5", + "@walmart/learning-mini-app": "20.0.3", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/metrics-mini-app": "0.19.4", "@walmart/mod-flex-mini-app": "1.15.5",
feat: :sparkles: Bump learning mini app version to 20.0.3
feat: :sparkles: Bump learning mini app version to 20.0.3
d5979aac656a94a8acd8d77e6594af201983918e
--- scripts/mini-app-scan/package-deprecation/helper.ts @@ -87,7 +87,7 @@ export function getDeprecatedLibraries(): LibraryEntry[] { * @param packageJson Parsed package.json object * @returns Array of formatted dependency strings with versions (name#version) */ -function extractDependenciesFromPackageJson(packageJson: any): string[] { +export function extractDependenciesFromPackageJson(packageJson: any): string[] { const deps: string[] = []; // Combine all dependency types @@ -107,36 +107,6 @@ function extractDependenciesFromPackageJson(packageJson: any): string[] { return deps; } -/** - * Reads and extracts dependencies from package.json files for specific packages. - * - * @param packageNames Array of package names to read dependencies from - * @returns Object mapping package names to their package.json dependencies - * - */ -export function readPackageJsonDependencies(packageNames: string[]): {[packageName: string]: string[]} { - const packageJsonDeps: {[packageName: string]: string[]} = {}; - - for (const pkgName of packageNames) { - try { - const packagePath = join(process.cwd(), 'node_modules', pkgName, 'package.json'); - - if (!existsSync(packagePath)) { - console.log(`package.json not found at ${packagePath}...`); - packageJsonDeps[pkgName] = []; - } - - const packageJsonContent = JSON.parse(readFileSync(packagePath, 'utf8')); - const deps = extractDependenciesFromPackageJson(packageJsonContent); - packageJsonDeps[pkgName] = deps; - } catch (error) { - console.error(`Error reading package.json for ${pkgName}:`, getErrorMessage(error)); - packageJsonDeps[pkgName] = []; - } - } - return packageJsonDeps; -} - function groupFindingsBySource(findings: DeprecationFinding[]): Map<string, DeprecationFinding[]> { const findingsBySource = new Map<string, DeprecationFinding[]>(); findings.forEach(finding => { --- scripts/mini-app-scan/package-deprecation/mini-app-check/crawler.ts @@ -2,8 +2,8 @@ import {join} from 'path'; import {existsSync} from 'fs'; import {execSync} from 'child_process'; import {version} from '../../../../package.json'; -import {getErrorMessage, readPackageJsonDependencies, getSettledResult} from '../helper'; -import {createTempDepsSourceConfig, cleanupFiles, readDepsMapFile, readDiscMapFile} from './fileHandler'; +import {getErrorMessage, getSettledResult} from '../helper'; +import {createTempDepsSourceConfig, cleanupFiles, readDepsMapFile, readDiscMapFile, readPackageJsonDependencies} from './fileHandler'; import {mergeAllDependencySources} from './utils'; --- scripts/mini-app-scan/package-deprecation/mini-app-check/fileHandler.ts @@ -1,5 +1,5 @@ import {existsSync, readFileSync, unlinkSync, writeFileSync} from 'fs'; -import {getErrorMessage} from '../helper'; +import {extractDependenciesFromPackageJson, getErrorMessage} from '../helper'; import {join} from 'path'; /** @@ -64,6 +64,36 @@ export async function readDiscMapFile(discMapPath: string): Promise<{[packageNam } } +/** + * Reads and extracts dependencies from package.json files for specific packages. + * + * @param packageNames Array of package names to read dependencies from + * @returns Object mapping package names to their package.json dependencies + * + */ +export function readPackageJsonDependencies(packageNames: string[]): {[packageName: string]: string[]} { + const packageJsonDeps: {[packageName: string]: string[]} = {}; + + for (const pkgName of packageNames) { + try { + const packagePath = join(process.cwd(), 'node_modules', pkgName, 'package.json'); + + if (!existsSync(packagePath)) { + console.log(`package.json not found at ${packagePath}...`); + packageJsonDeps[pkgName] = []; + } + + const packageJsonContent = JSON.parse(readFileSync(packagePath, 'utf8')); + const deps = extractDependenciesFromPackageJson(packageJsonContent); + packageJsonDeps[pkgName] = deps; + } catch (error) { + console.error(`Error reading package.json for ${pkgName}:`, getErrorMessage(error)); + packageJsonDeps[pkgName] = []; + } + } + return packageJsonDeps; +} + /** * Creates a temporary deps-source.json configuration file for specific packages. *
fix: move readPackageJsonDependencies to file handler
fix: move readPackageJsonDependencies to file handler
d8de840c96ece2a2c364ab6218bc62bbddc809ec
--- package-lock.json @@ -4475,9 +4475,9 @@ } }, "@walmart/taskit-mini-app": { - "version": "0.257.0-rc.1", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.257.0-rc.1.tgz", - "integrity": "sha512-rDrrlT1+mtQBuir5227IWNo2nBX8R/GNXF7CapsKw4V1QhTjc09TD0RKS74KgqsY23I5YXmf4+ElSRhLinek2w==" + "version": "0.260.0-rc.0", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.260.0-rc.0.tgz", + "integrity": "sha512-nmV3GNJLugjrbeacp10vvrm+Vi6m2JwJh9+rffMiCFmQKwNDJxwss658KJvkOp4lDtHZ+s7rsnvaUuDNvovtKw==" }, "@walmart/time-clock-mini-app": { "version": "0.4.33", --- package.json @@ -101,7 +101,7 @@ "@walmart/schedule-mini-app": "0.12.0", "@walmart/settings-mini-app": "1.6.0", "@walmart/shelfavailability-mini-app": "0.8.3", - "@walmart/taskit-mini-app": "0.257.0-rc.1", + "@walmart/taskit-mini-app": "0.260.0-rc.0", "@walmart/time-clock-mini-app": "0.4.33", "@walmart/ui-components": "1.3.0-rc.14", "@walmart/welcomeme-mini-app": "0.47.0",
Updating taskIt version
Updating taskIt version
f6522c936c3292ff31d01cd8d7f4d777e93905e4
--- package.json @@ -126,7 +126,7 @@ "@walmart/onewalmart-miniapp": "1.0.24", "@walmart/pay-stub-miniapp": "0.15.2", "@walmart/payrollsolution_miniapp": "0.141.3", - "@walmart/price-changes-mini-app": "1.10.12", + "@walmart/price-changes-mini-app": "1.10.15", "@walmart/profile-feature-app": "patch:@walmart/profile-feature-app@npm%3A1.138.3#~/.yarn/patches/@walmart-profile-feature-app-npm-1.138.3-9802440ed6.patch", "@walmart/react-native-encrypted-storage": "~1.1.3", "@walmart/react-native-env": "6.1.4", --- yarn.lock @@ -6722,9 +6722,9 @@ __metadata: languageName: node linkType: hard -"@walmart/price-changes-mini-app@npm:1.10.12": - version: 1.10.12 - resolution: "@walmart/price-changes-mini-app@npm:1.10.12" +"@walmart/price-changes-mini-app@npm:1.10.15": + version: 1.10.15 + resolution: "@walmart/price-changes-mini-app@npm:1.10.15" peerDependencies: "@react-navigation/native": ^6.0.8 "@react-navigation/stack": ^6.2.0 @@ -6751,7 +6751,7 @@ __metadata: redux-saga: ^1.1.3 reduxsauce: ^1.2.0 uuid: ^3.3.2 - checksum: 10c0/7118a9dba169f63bfe6a1e10f5b8285a243bbdca250a41a3e4d9cf4eee6117ac88fe741fbcb30d4cdcc8daa5f8d10f13ebbd6b912b303999d83fd46b8ab9c262 + checksum: 10c0/3b1fe0f2047d74d0db69c82cc48306f756cc7771e166061a1c023b62aa89db8bcdcb3e2cddec3f274487ca5bb71c90ebf1588ab000a092f0d8de150384c19d3c languageName: node linkType: hard @@ -7841,7 +7841,7 @@ __metadata: "@walmart/onewalmart-miniapp": "npm:1.0.24" "@walmart/pay-stub-miniapp": "npm:0.15.2" "@walmart/payrollsolution_miniapp": "npm:0.141.3" - "@walmart/price-changes-mini-app": "npm:1.10.12" + "@walmart/price-changes-mini-app": "npm:1.10.15" "@walmart/profile-feature-app": "patch:@walmart/profile-feature-app@npm%3A1.138.3#~/.yarn/patches/@walmart-profile-feature-app-npm-1.138.3-9802440ed6.patch" "@walmart/react-native-encrypted-storage": "npm:~1.1.3" "@walmart/react-native-env": "npm:6.1.4"
chore: Updating PC version for Drop 23
chore: Updating PC version for Drop 23
1b5694fe26202805fd7123fc4de048c0303acd2c
--- packages/allspark-foundation/__tests__/Translation/modals/client.test.ts @@ -76,22 +76,22 @@ describe('TranslationFeatureClient', () => { expect(config).toEqual({ dateFormat: 'DD/MM/YYYY', currency: 'MX$' }); }); it('returns the correct language on ios, if AppleLocale exists', async () => { - const language = await AllsparkTranslationClient.getDeviceLanguage(); + const language = AllsparkTranslationClient.getDeviceLanguage(); expect(language).toBe('en_US'); }); it('returns the correct language on ios, if AppleLocale does not exists', async () => { NativeModules.SettingsManager.settings.AppleLocale = null; - const language = await AllsparkTranslationClient.getDeviceLanguage(); + const language = AllsparkTranslationClient.getDeviceLanguage(); expect(language).toBe('en_US'); }); it('returns the correct language on android', async () => { Platform.OS = 'android'; - const language = await AllsparkTranslationClient.getDeviceLanguage(); + const language = AllsparkTranslationClient.getDeviceLanguage(); expect(language).toBe('en_US'); }); it('should sync language with the device default language', async () => { const originalDeviceLanguage = - await AllsparkTranslationClient.getDeviceLanguage(); + AllsparkTranslationClient.getDeviceLanguage(); expect(originalDeviceLanguage).toBe('en_US'); const parsedDeviceLanguage = originalDeviceLanguage.replace('_', '-'); expect(parsedDeviceLanguage).toBe('en-US'); --- packages/allspark-foundation/src/Translation/client.ts @@ -175,7 +175,7 @@ export const TranslationClient = (config?: TranslationClientOptions) => { * Returns the device language which was configured on the Settings Menu. * @returns the device language in this format language_COUNTRY. For example, for USA'S English returns en_US. */ - const getDeviceLanguage = async () => { + const getDeviceLanguage = () => { return Platform.OS === 'ios' ? NativeModules.SettingsManager?.settings?.AppleLocale || NativeModules.SettingsManager?.settings?.AppleLanguages?.[0] //iOS 13 @@ -186,8 +186,8 @@ export const TranslationClient = (config?: TranslationClientOptions) => { * Formats the language received from the device and check if the language is supported or not by the market. * Once this is done, it is responsible for changing the language parsed in the application if it's necessary. */ - const syncToDeviceLanguage = async () => { - const originalDeviceLanguage = await getDeviceLanguage(); + const syncToDeviceLanguage = () => { + const originalDeviceLanguage = getDeviceLanguage(); const parsedDeviceLanguage = originalDeviceLanguage.replace('_', '-'); const supportedLanguages = _config?.supportedLanguages || [];
Changed async behavior to sync behavior
Changed async behavior to sync behavior