commit_hash
stringlengths
40
40
input
stringlengths
13
7.99k
output
stringlengths
5
155
full_message
stringlengths
6
8.96k
6927918d503b8f7898e2f405615ad4df857a71a7
--- package-lock.json @@ -89,7 +89,7 @@ "@walmart/time-clock-mini-app": "2.111.3", "@walmart/topstock-mini-app": "1.0.13", "@walmart/ui-components": "1.15.1", - "@walmart/welcomeme-mini-app": "0.83.0-736-d783686", + "@walmart/welcomeme-mini-app": "0.84.0", "@walmart/wfm-ui": "0.2.26", "axios": "~1.2.6", "axios-cache-adapter": "2.7.3", @@ -9324,9 +9324,9 @@ } }, "node_modules/@walmart/welcomeme-mini-app": { - "version": "0.83.0-736-d783686", - "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.83.0-736-d783686.tgz", - "integrity": "sha512-Gzx9hcRL5xBSzsNZjhmUeFen62Cw1T1JNtB6ge4DVQaksBwS4DUkuIASMa4MK7/GWzFUYgFyqBSLW/L4dEbeKA==", + "version": "0.84.0", + "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.84.0.tgz", + "integrity": "sha512-VIXacXkQsAhudxTrK/F4855zCXuZcbjCxIknClEm9+3Sg4Y92HXdup01GIH3vL0WuFICE2jjKV1VR9y/fPyCAg==", "hasInstallScript": true, "dependencies": { "apisauce": "^1.1.2" @@ -33908,9 +33908,9 @@ } }, "@walmart/welcomeme-mini-app": { - "version": "0.83.0-736-d783686", - "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.83.0-736-d783686.tgz", - "integrity": "sha512-Gzx9hcRL5xBSzsNZjhmUeFen62Cw1T1JNtB6ge4DVQaksBwS4DUkuIASMa4MK7/GWzFUYgFyqBSLW/L4dEbeKA==", + "version": "0.84.0", + "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.84.0.tgz", + "integrity": "sha512-VIXacXkQsAhudxTrK/F4855zCXuZcbjCxIknClEm9+3Sg4Y92HXdup01GIH3vL0WuFICE2jjKV1VR9y/fPyCAg==", "requires": { "apisauce": "^1.1.2" } --- package.json @@ -130,7 +130,7 @@ "@walmart/time-clock-mini-app": "2.111.3", "@walmart/topstock-mini-app": "1.0.13", "@walmart/ui-components": "1.15.1", - "@walmart/welcomeme-mini-app": "0.83.0-736-d783686", + "@walmart/welcomeme-mini-app": "0.84.0", "@walmart/wfm-ui": "0.2.26", "axios": "~1.2.6", "axios-cache-adapter": "2.7.3",
chore: welcomeme version bump
chore: welcomeme version bump
92cab72bd2d52c3f1f996ee88190ddfcb44db6d6
--- packages/allspark-redux-store/src/store/createStore.ts @@ -8,8 +8,6 @@ import type { ReducerMap, GlobalState } from '../types'; import type { CreateStoreOptions, SharedReduxStore } from './types'; import { createDynamicMiddleware } from './dynamicMiddleware'; -// type PartialBy<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>; - /** * @description * Creates shared redux store. Will merge given
chore: remove comment
chore: remove comment
ff8d3f32cd6226e0a9eccd8d38cbcf9e47e2e3c8
--- docs/CHANGELOG.md @@ -1,3 +1,10 @@ +# [2.27.0](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/compare/v2.26.2...v2.27.0) (2025-04-30) + + +### Features + +* SMDV-9999 update package ([7f3a5b4](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/commit/7f3a5b4fabaef01fe2afd134e72114429bdf5a8e)) + ## [2.26.2](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/compare/v2.26.1...v2.26.2) (2025-04-30) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/wmconnect-mini-app", - "version": "2.26.2", + "version": "2.27.0", "main": "index.ts", "files": [ "dist/"
chore(release): 2.27.0 [skip ci]
chore(release): 2.27.0 [skip ci] # [2.27.0](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/compare/v2.26.2...v2.27.0) (2025-04-30) ### Features * SMDV-9999 update package ([7f3a5b4](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/commit/7f3a5b4fabaef01fe2afd134e72114429bdf5a8e))
d99e3112d9a93f37c07b34144d969682ae7326c1
--- src/utils/user.ts @@ -4,6 +4,7 @@ import {Associate} from '../types'; import {GetAssociateNameQuery} from '../queries/getAssociateName'; import {ClockStatusEnum} from './ClockStatusEnum'; import moment from 'moment'; +import {payTypes} from '../constants'; const OBFUSCATION_KEY = 'texting-mini-app'; const OBFUSCATION_PARSE_KEY = OBFUSCATION_KEY.padStart(64, '0'); @@ -20,6 +21,17 @@ export const decryptUserId = (userId: string) => { return decrypted.toString(CryptoJS.enc.Utf8); }; +export const returnClockedStatusBasedOnSchedule = (scheduleInfo: any) => { + const {schedStartTime, schedEndTime} = + getScheduleStartAndEndTime(scheduleInfo); + const currentTime = moment().format('h:mma'); + if (currentTime < schedStartTime || currentTime > schedEndTime) { + return false; + } else { + return true; + } +}; + export const associateIsAbsent = (associate?: Associate) => associate?.absentData?.absenceTypeCode === 1; @@ -27,6 +39,22 @@ export const associateIsTardy = (associate?: Associate) => associate?.absentData?.absenceTypeCode === 2; export const associateIsClockedIn = (associate?: Associate) => { + if ( + associate?.payType?.toUpperCase() === payTypes.SALARIED && + !associate.punch + ) { + return true; + } + + if (!associate?.punch) { + if (!associate?.storeSchedule) { + return true; + } else if (associate.storeSchedule && associate.storeSchedule.length > 0) { + return returnClockedStatusBasedOnSchedule(associate.storeSchedule); + } else { + false; + } + } return ( ClockStatusEnum.clockedIn === Number(associate?.punch?.clockStatus) || ClockStatusEnum.unknown === Number(associate?.punch?.clockStatus) --- src/utils/user.ts @@ -4,6 +4,7 @@ import {Associate} from '../types'; import {GetAssociateNameQuery} from '../queries/getAssociateName'; import {ClockStatusEnum} from './ClockStatusEnum'; import moment from 'moment'; +import {payTypes} from '../constants'; const OBFUSCATION_KEY = 'texting-mini-app'; const OBFUSCATION_PARSE_KEY = OBFUSCATION_KEY.padStart(64, '0'); @@ -20,6 +21,17 @@ export const decryptUserId = (userId: string) => { return decrypted.toString(CryptoJS.enc.Utf8); }; +export const returnClockedStatusBasedOnSchedule = (scheduleInfo: any) => { + const {schedStartTime, schedEndTime} = + getScheduleStartAndEndTime(scheduleInfo); + const currentTime = moment().format('h:mma'); + if (currentTime < schedStartTime || currentTime > schedEndTime) { + return false; + } else { + return true; + } +}; + export const associateIsAbsent = (associate?: Associate) => associate?.absentData?.absenceTypeCode === 1; @@ -27,6 +39,22 @@ export const associateIsTardy = (associate?: Associate) => associate?.absentData?.absenceTypeCode === 2; export const associateIsClockedIn = (associate?: Associate) => { + if ( + associate?.payType?.toUpperCase() === payTypes.SALARIED && + !associate.punch + ) { + return true; + } + + if (!associate?.punch) { + if (!associate?.storeSchedule) { + return true; + } else if (associate.storeSchedule && associate.storeSchedule.length > 0) { + return returnClockedStatusBasedOnSchedule(associate.storeSchedule); + } else { + false; + } + } return ( ClockStatusEnum.clockedIn === Number(associate?.punch?.clockStatus) || ClockStatusEnum.unknown === Number(associate?.punch?.clockStatus)
update the clock status for salaried associate
update the clock status for salaried associate
29fafccfbb9d5b7ab548919787c87e6f1b44dcb3
--- ios/Podfile.lock @@ -573,7 +573,7 @@ PODS: - React - react-native-pdf (6.2.1): - React - - react-native-ptt-module (1.1.38): + - react-native-ptt-module (1.1.39): - PTT (= 0.2.3) - React - react-native-safe-area-context (3.1.8): @@ -981,7 +981,7 @@ SPEC CHECKSUMS: react-native-logger: 3bcc179347707f13df82f8b00eec0d6d6cc29271 react-native-netinfo: d2c312fa4b151214e1d5c8456ddb5f28ff24a576 react-native-pdf: 2fc624841b3628db8df318c803874152b33580f5 - react-native-ptt-module: bd3b22544a00873aff4ed84ded7886e592d74ea7 + react-native-ptt-module: 803ec56c5c691a8784baebb17dab8181ce04dbc2 react-native-safe-area-context: 01158a92c300895d79dee447e980672dc3fb85a6 react-native-sumo-sdk: 8a034fe724417d8c9465951630e229edef2f738f react-native-video: 8d97379f3c2322a569f1e27542ad1a646cad9444 --- package-lock.json @@ -1937,9 +1937,9 @@ "integrity": "sha512-iTkDEL7GeYYS8laso4ECQ7DyHgBxnJh/uP5PJNQMHZyKb8niIwIwb19HFLuGBVRa9vZIjTz7mChSydbIn4KV0w==" }, "@walmart/push-to-talk-mini-app": { - "version": "0.0.11", - "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.0.11.tgz", - "integrity": "sha512-n8E3z89d8UfbjNwCXlWHRC6lz7AB9QnHnfn+gWfiZajmfO3YT8/s9CroBjCxhWGPSU1vxvN0mfJcMv3/or7RUA==" + "version": "0.0.14", + "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.0.14.tgz", + "integrity": "sha512-dmQDuJslvFJGQMwIHTlGgQqbEEWYZKBcQSOmAcC3M5nGPaf58+8/sXymSv+DAYFrFTozOYrcoIDbWvJUqNkCAw==" }, "@walmart/react-native-logger": { "version": "1.14.0", @@ -9176,9 +9176,9 @@ "integrity": "sha512-PO99dptMocEfUSS3SM7gY6UqophaBxizKjnZ7FcEwa+H4ONVxTk310/JCXJ9vdNunomgpxHluKRXnApfm9Md1w==" }, "react-native-ptt-module": { - "version": "1.1.38", - "resolved": "https://npme.walmart.com/react-native-ptt-module/-/react-native-ptt-module-1.1.38.tgz", - "integrity": "sha512-aOV2E/8K6axP2Lu1BKuk66H0+saT4ovQZNlM4dEXZO/HpccrDmRgP013QBLIiOOA0j2Lk/beyCLkLYknF45JAQ==" + "version": "1.1.39", + "resolved": "https://npme.walmart.com/react-native-ptt-module/-/react-native-ptt-module-1.1.39.tgz", + "integrity": "sha512-QTogEsGNEVBR2ImwCStzK9bS1vgqYQ6zemgQSO8KDSg3cBtrAMD3HPvzrFKKlvMDKxI98qkHiOJHBfU5lE31wQ==" }, "react-native-qrcode-svg": { "version": "6.0.6", --- package.json @@ -44,7 +44,7 @@ "@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/push-to-talk-mini-app": "0.0.14", "@walmart/react-native-logger": "^1.14.0", "@walmart/react-native-shared-navigation": "^0.2.0", "@walmart/redux-store": "^1.0.4", @@ -67,7 +67,7 @@ "react-native-modal": "^11.5.6", "react-native-pdf": "^6.2.0", "react-native-popup-menu": "^0.15.9", - "react-native-ptt-module": "1.1.38", + "react-native-ptt-module": "1.1.39", "react-native-qrcode-svg": "^6.0.6", "react-native-reanimated": "^1.10.2", "react-native-safe-area-context": "^3.1.3", --- src/navigation/Navigation.tsx @@ -15,6 +15,8 @@ import { GroupPreviewNavProperties, GroupPreviewScreen, TalkDialogNavProperties, + JoinGroupScreen, + JoinGroupNavProperties, } from '@walmart/push-to-talk-mini-app'; import {Icon} from '../images'; @@ -159,6 +161,11 @@ const RootNav = () => ( component={DialogScreen} options={TalkDialogNavProperties} /> + <RootStack.Screen + name='PttJoinGroupDialog' + component={JoinGroupScreen} + options={JoinGroupNavProperties} + /> </RootStack.Navigator> );
PTT version changes
PTT version changes
2eda4408629f724f6657c6530fa2425fa17ecef1
--- packages/allspark-foundation/__mocks__/i18next.js @@ -0,0 +1,12 @@ +module.exports = { + ...jest.requireActual('i18next'), + init: jest.fn(), + changeLanguage: jest.fn(), + addResources: jest.fn(), + setDefaultNamespace: jest.fn(), + cloneInstance: jest.fn(), + on: jest.fn(), + language: 'en-US', + languages: ['en-US', 'es-US'], + options: {}, + }; \ No newline at end of file --- packages/allspark-foundation/__tests__/Translation/client.test.tsx @@ -1,17 +1,7 @@ import i18next from 'i18next'; import { TranslationClient, DefaultConfig, AllsparkTranslationClient } from '../../src/Translation/client'; -jest.mock('i18next', () => ({ - init: jest.fn(), - changeLanguage: jest.fn(), - addResources: jest.fn(), - setDefaultNamespace: jest.fn(), - cloneInstance: jest.fn(), - on: jest.fn(), - language: 'en-US', - languages: ['en-US', 'es-US'], - options: {}, -})); +jest.mock('i18next'); jest.mock('react-native', () => ({ NativeModules: {
mocking i18next in global env
mocking i18next in global env
0f71c8366dec61375e1e8088961e6d85febb057a
--- packages/allspark-foundation/__tests__/Translation/client.test.tsx @@ -41,7 +41,7 @@ describe('TranslationClient', () => { it('should initialize the translation client with default options', async () => { const resourceData = { resources: { 'en-US': { container: { key: 'value' } } } }; await translationClient.initialize({ ...DefaultConfig, ...resourceData }); - expect(i18next.init).toHaveBeenCalledWith(DefaultConfig); + expect(i18next.init).toHaveBeenCalledWith(expect.objectContaining(DefaultConfig)); expect(translationClient.isInitialized()).toBe(true); });
build fails fix translation
build fails fix translation
b4ba62af128806000c566e9449721880e9b98894
--- packages/allspark-foundation/src/Components/DynamicComponents.tsx @@ -1,4 +1,4 @@ -import React, { FC, useMemo } from 'react'; +import React, { FC } from 'react'; import { StyleProp, View, ViewStyle } from 'react-native'; import { DynamicQueue, @@ -55,13 +55,12 @@ export type ListProps = { export class DynamicComponent<Props = {}, ID extends string = string> { private _records = new Map<ID, ComponentRecord<Props>>(); private _eventManager = new EventManager<{ - listChange: string; - recordChange: string; - }>(['listChange', 'recordChange']); + change: string; + }>(['change']); - private _listChangeListener = { + private _changeListener = { addChangeListener: (cb: () => void) => - this._eventManager.addListener('listChange', cb), + this._eventManager.addListener('change', cb), }; /** @@ -85,8 +84,7 @@ export class DynamicComponent<Props = {}, ID extends string = string> { }); // Adding must re-render list and record - this._eventManager.runEvent('listChange', id); - this._eventManager.runEventListener('recordChange', id, id); + this._eventManager.runEvent('change', id); }; /** @@ -103,7 +101,7 @@ export class DynamicComponent<Props = {}, ID extends string = string> { }); // Record change alone handles re-rendering within list and record - this._eventManager.runEventListener('recordChange', id, id); + this._eventManager.runEvent('change', id); }; /** @@ -118,15 +116,7 @@ export class DynamicComponent<Props = {}, ID extends string = string> { const { id, style } = props; const config = this._records.get(id); - const recordChangeListener = useMemo( - () => ({ - addChangeListener: (cb: () => void) => - this._eventManager.addListener('recordChange', cb, { id }), - }), - [id] - ); - - useRenderOnChange(recordChangeListener); + useRenderOnChange(this._changeListener); if (!config) { return null; @@ -151,7 +141,7 @@ export class DynamicComponent<Props = {}, ID extends string = string> { public List = (props: ListProps) => { const { limit = 1, method = 'lifo', style } = props; - useRenderOnChange(this._listChangeListener); + useRenderOnChange(this._changeListener); const records = Array.from(this._records.values()); @@ -242,8 +232,7 @@ export class DynamicComponent<Props = {}, ID extends string = string> { */ public remove = (id: ID) => { if (this._records.delete(id)) { - // this._eventManager.runEventListener('recordChange', id, id); - this._eventManager.runEvent('listChange', id); + this._eventManager.runEvent('change', id); } }; }
refactor: change dynamic component to internally use one change event rather than specific list and record events
refactor: change dynamic component to internally use one change event rather than specific list and record events
e174c86be22d668fdb1fcc563df139a5207d44cc
--- package.json @@ -88,9 +88,9 @@ "@walmart/react-native-logger": "1.35.0", "@walmart/react-native-scanner-3.0": "0.10.4", "@walmart/react-native-sumo-sdk": "2.8.0", - "@walmart/roster-mini-app": "3.7.0", + "@walmart/roster-mini-app": "3.8.0", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "3.6.0", + "@walmart/wmconnect-mini-app": "3.7.0", "babel-jest": "^29.6.3", "chance": "^1.1.11", "crypto-js": "~4.2.0", --- yarn.lock @@ -6348,9 +6348,9 @@ __metadata: "@walmart/react-native-logger": "npm:1.35.0" "@walmart/react-native-scanner-3.0": "npm:0.10.4" "@walmart/react-native-sumo-sdk": "npm:2.8.0" - "@walmart/roster-mini-app": "npm:3.7.0" + "@walmart/roster-mini-app": "npm:3.8.0" "@walmart/ui-components": "npm:1.15.1" - "@walmart/wmconnect-mini-app": "npm:3.6.0" + "@walmart/wmconnect-mini-app": "npm:3.7.0" babel-jest: "npm:^29.6.3" chance: "npm:^1.1.11" crypto-js: "npm:~4.2.0" @@ -6455,9 +6455,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:3.7.0": - version: 3.7.0 - resolution: "@walmart/roster-mini-app@npm:3.7.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-3.7.0.tgz" +"@walmart/roster-mini-app@npm:3.8.0": + version: 3.8.0 + resolution: "@walmart/roster-mini-app@npm:3.8.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-3.8.0.tgz" peerDependencies: "@walmart/allspark-foundation": ">=6.32.0" expo: ~52.0.46 @@ -6468,7 +6468,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/049433ac68524af208e699ad5d439b64402003fbc86eb9248f2a85059a87dceb66f51a7037710deaccf6003ac9d2a49db315630250981d5780dc66166d225174 + checksum: 10c0/ef68a0df710730b572e13b3e18397492b3b13106808482b24d1bb02760f599d0a0fda3296cc9a45d37ba7239ab5d513e4d5aa11811fa1d7092f0b569d8854570 languageName: node linkType: hard @@ -6492,9 +6492,9 @@ __metadata: languageName: node linkType: hard -"@walmart/wmconnect-mini-app@npm:3.6.0": - version: 3.6.0 - resolution: "@walmart/wmconnect-mini-app@npm:3.6.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-3.6.0.tgz" +"@walmart/wmconnect-mini-app@npm:3.7.0": + version: 3.7.0 + resolution: "@walmart/wmconnect-mini-app@npm:3.7.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-3.7.0.tgz" peerDependencies: "@walmart/allspark-foundation": ">=6.32.0" expo: ~52.0.46 @@ -6505,7 +6505,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/1ba0b0dfadb2f9dc7813bda36d88c9961e2cf2b8204fbda6a2c4465c09fb077b2c65b60f425787c5d7bf866e63d2d6a60d2ac14270667f8b7b746c58edbc7912 + checksum: 10c0/981975ee68eda7d59cf3bd337ea9931c4f4abb9ce758ccf2664293da7a93d9dee5950af40e019d2423947548bba23c78b549b5d45240785afee4800090374fd9 languageName: node linkType: hard
feat(ui): updated versions
feat(ui): updated versions
2e9e9f6ff4b6e28c7ec384d89921933677a1f8f9
--- src/hooks/roster.ts @@ -137,27 +137,6 @@ const checkDeleteMessagePermissions = ( return isSalariedOrTeamLead; } }; - -// const checkDeleteTotalStoreMessagePermissions = ( -// permissions: Permissions[], -// RMATotalStorePermissionsPath: string, -// isUserSalaried: boolean, -// RMADeletePermission: string, -// ) => { -// const deleteStoreMessageRBACPolicy = find( -// permissions, -// (item) => item?.rn === RMATotalStorePermissionsPath, -// ); -// if (!deleteStoreMessageRBACPolicy) { -// return false; -// } -// if (deleteStoreMessageRBACPolicy.a === RMADeletePermission) { -// return true; -// } else { -// return isUserSalaried; -// } -// }; - export const useRbacConfigForDeleteMessage = ( isTotalStoreMessage?: boolean, isTeamMessage?: boolean, @@ -175,21 +154,7 @@ export const useRbacConfigForDeleteMessage = ( if (RBACState?.loaded && !!RBACState?.data && RMAAppId) { const permissions = RBACState.data[RMAAppId]?.permissions; - // const hasDeleteTotalStorePermission = - // checkDeleteTotalStoreMessagePermissions( - // permissions, - // RMATotalStorePermissionsPath, - // isUserSalaried, - // RMADeletePermission, - // ); if (permissions && permissions.length) { - // if (isTeamMessage) { - // return hasDeleteTeamPermission; - // } else if (isTotalStoreMessage) { - // return hasDeleteTotalStorePermission; - // } else { - // return isSalariedOrTeamLead; - // } const hasDeletePermission = checkDeleteMessagePermissions( permissions, RMATeamPermissionsPath, --- src/hooks/roster.ts @@ -137,27 +137,6 @@ const checkDeleteMessagePermissions = ( return isSalariedOrTeamLead; } }; - -// const checkDeleteTotalStoreMessagePermissions = ( -// permissions: Permissions[], -// RMATotalStorePermissionsPath: string, -// isUserSalaried: boolean, -// RMADeletePermission: string, -// ) => { -// const deleteStoreMessageRBACPolicy = find( -// permissions, -// (item) => item?.rn === RMATotalStorePermissionsPath, -// ); -// if (!deleteStoreMessageRBACPolicy) { -// return false; -// } -// if (deleteStoreMessageRBACPolicy.a === RMADeletePermission) { -// return true; -// } else { -// return isUserSalaried; -// } -// }; - export const useRbacConfigForDeleteMessage = ( isTotalStoreMessage?: boolean, isTeamMessage?: boolean, @@ -175,21 +154,7 @@ export const useRbacConfigForDeleteMessage = ( if (RBACState?.loaded && !!RBACState?.data && RMAAppId) { const permissions = RBACState.data[RMAAppId]?.permissions; - // const hasDeleteTotalStorePermission = - // checkDeleteTotalStoreMessagePermissions( - // permissions, - // RMATotalStorePermissionsPath, - // isUserSalaried, - // RMADeletePermission, - // ); if (permissions && permissions.length) { - // if (isTeamMessage) { - // return hasDeleteTeamPermission; - // } else if (isTotalStoreMessage) { - // return hasDeleteTotalStorePermission; - // } else { - // return isSalariedOrTeamLead; - // } const hasDeletePermission = checkDeleteMessagePermissions( permissions, RMATeamPermissionsPath,
Removing comments
Removing comments
242e1327d7b495dc079ca0546d58d2d6bc16c97e
--- packages/allspark-foundation/__tests__/Components/AllsparkBanner.test.tsx @@ -0,0 +1,22 @@ +import React from 'react'; +import { render, screen } from '@testing-library/react-native'; +import { AllsparkBanner } from '../../src/Components/Banners/AllsparkBanner'; +import { BannerConfig } from '../../src/Components/Banners/types'; + +const props = { + banner: { + id: '1', + type: 'banner', + variant: 'info', + value: 'Test Banner', + } as BannerConfig & { id: string }, + onRemove: jest.fn, +}; + +describe('AllsparkBanner', () => { + test('renders banner correctly', async () => { + render(<AllsparkBanner {...props} />); + const bannerElement = screen.getByText(props.banner.value); + expect(bannerElement).toBeTruthy(); + }); +}); --- packages/allspark-foundation/__tests__/__mocks__/@walmart/gtp-shared-components.js @@ -0,0 +1,51 @@ +const snackbar = { addSnack: jest.fn() }; +module.exports = { + ...jest.requireActual('@walmart/gtp-shared-components'), + PrimaryButton: 'PrimaryButton', + ChevronRightIcon: 'ChevronRightIcon', + ChevronLeftIcon: 'ChevronLeftIcon', + SolidCard: 'SolidCard', + SecondaryButton: 'SecondaryButton', + Heading: 'Heading', + Card: 'Card', + Body: 'Body', + Button: 'Button', + Title: 'Title', + Title2: 'Title2', + Title3: 'Title3', + MenuIcon: 'MenuIcon', + Headline: 'Headline', + Caption: 'Caption', + Display: 'Display', + Link: 'Link', + LinkButton: 'LinkButton', + CloseIcon: 'CloseIcon', + SparkIcon: 'SparkIcon', + GlobeIcon: 'GlobeIcon', + Subheader: 'Subheader', + Subheader2: 'Subheader2', + Snackbar: 'Snackbar', + RadioItemGroup: 'RadioItemGroup', + CheckboxItemGroup: 'CheckboxItemGroup', + WarningIcon: 'WarningIcon', + ExclamationCircleFillIcon: 'ExclamationCircleFillIcon', + ExternalLinkIcon: 'ExternalLinkIcon', + MessageWarning: 'MessageWarning', + MessageError: 'MessageError', + Nudge: 'Nudge', + ExclamationCircleIcon: 'ExclamationCircleIcon', + Spinner: 'Spinner', + Dropdown: 'Dropdown', + LivingDesignProvider: 'LivingDesignProvider', + ThemeProvider: 'ThemeProvider', + StoreIcon: 'StoreIcon', + PhoneIcon: 'PhoneIcon', + Radio: 'Radio', + Switch: 'Switch', + useSnackbar: jest.fn(() => snackbar), + Alert: 'Alert', + HomeIcon: 'HomeIcon', + Select: 'Select', + TextField: 'TextField', + TextArea: 'TextArea', +};
component test
component test
550e092b3d8503e35a9ac746599c2e7c5ed1e22f
--- src/containers/UserHeader.tsx @@ -38,7 +38,7 @@ export const UserHeader = () => { return ( <ListItem UNSAFE_style={styles.item} - title={name} + title={name as string} leading={<Avatar userId={userId} style={styles.avatar} viewer={true} />} trailing={ <Switch isOn={presence === 'online'} onValueChange={onStatusChange} /> --- src/navigation/components.tsx @@ -46,7 +46,6 @@ export const LivingDesignTabBar = (props: MaterialTopTabBarProps) => { }); } }; - return ( <TabNavigationItem key={route.key} @@ -59,7 +58,7 @@ export const LivingDesignTabBar = (props: MaterialTopTabBarProps) => { color: tintColor || '', })} trailing={options.tabBarBadge?.()}> - {label} + {label as string} </TabNavigationItem> ); }); --- src/screens/SearchScreen.tsx @@ -93,6 +93,7 @@ const SearchHeaderBase = (props: StackHeaderProps) => { }, [navigation, searchInput]); return ( + // @ts-ignore <View style={[styles.header, {paddingTop: top}, options.headerStyle]}> {navigation.canGoBack() && ( <Animated.View style={[options.headerLeftContainerStyle]}> --- src/containers/UserHeader.tsx @@ -38,7 +38,7 @@ export const UserHeader = () => { return ( <ListItem UNSAFE_style={styles.item} - title={name} + title={name as string} leading={<Avatar userId={userId} style={styles.avatar} viewer={true} />} trailing={ <Switch isOn={presence === 'online'} onValueChange={onStatusChange} /> --- src/navigation/components.tsx @@ -46,7 +46,6 @@ export const LivingDesignTabBar = (props: MaterialTopTabBarProps) => { }); } }; - return ( <TabNavigationItem key={route.key} @@ -59,7 +58,7 @@ export const LivingDesignTabBar = (props: MaterialTopTabBarProps) => { color: tintColor || '', })} trailing={options.tabBarBadge?.()}> - {label} + {label as string} </TabNavigationItem> ); }); --- src/screens/SearchScreen.tsx @@ -93,6 +93,7 @@ const SearchHeaderBase = (props: StackHeaderProps) => { }, [navigation, searchInput]); return ( + // @ts-ignore <View style={[styles.header, {paddingTop: top}, options.headerStyle]}> {navigation.canGoBack() && ( <Animated.View style={[options.headerLeftContainerStyle]}>
fix tsc errors
fix tsc errors
a37f777ad4e59a5677ffcc604df191950fc17240
--- .looper-native-common.yml @@ -4,6 +4,7 @@ envs: global: variables: RCT_NO_LAUNCH_PACKAGER: true + PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true KEYCHAIN_PW: "%{credentials.secret('ios-sign-keychain-pw')}" XCODE_CONFIG: 'Release' PROVISIONING_PROFILE: ./BuildSupport/Allspark_MeAtWM_Beta_InHouse_Profile.mobileprovision @@ -14,7 +15,9 @@ envs: XC_TARGET: 'AllSpark' TARGET_XCODE: "11.5" GITHUB_TOKEN: ENC[CGMhL3M/PKGSd9JmVpyMSAxGD/ZNRzJbf6v6/VuJBIWoj226WrPkQe5i7DIFJjTR] - NO_PROXY: "*.walmart.com, chromium.googlesource.com" + http_proxy: 'http://sysproxy.wal-mart.com:8080' + https_proxy: 'http://sysproxy.wal-mart.com:8080' + NO_PROXY: "*.walmart.com, chromium.googlesource.com, apps.betacrash.com" #BetaCrash BETACRASH_TOKEN: ENC[iHTVp1f+Zsd1SDXzxbQNqv82W/567khXD0AuBEt5dfrbR1EdM15ThlelIUrJkH6V] --- ios/BuildSupport/install-cocoapods.sh @@ -10,8 +10,8 @@ CCP_VER=1.9.3 export GEM_HOME=$HOME/.gem export PATH=$GEM_HOME/bin:$PATH -export https_proxy=http://sysproxy.wal-mart.com:8080 -export http_proxy=http://sysproxy.wal-mart.com:8080 +export https_proxy=http://proxy.wal-mart.com:9080 +export http_proxy=http://proxy.wal-mart.com:9080 export no_proxy=repository.walmart.com,repo.wal-mart.com,localhost, chromium.googlesource.com gem uninstall cocoapods -a -x --user-install --verbose
some more changes
some more changes
04b947b786f8a2b8b7b6e167e8a75255a689ac33
--- package-lock.json @@ -4498,9 +4498,9 @@ } }, "@walmart/taskit-mini-app": { - "version": "0.12.0", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.12.0.tgz", - "integrity": "sha512-BI7A4mCNVMdT64o0jZmzMdWyWDaxpfCZlPqFebbbkcxf9p2Qebh4gByzkQmN2Eyj349uZrUHFN3iP5kkURxP5Q==" + "version": "0.13.0", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.13.0.tgz", + "integrity": "sha512-IYG7N2zuLKzueUY5okX21sc05blpWL3jxRkQRVX3fC1yUzngCgwPkO6K8d9mhjImmdn62zRDKCU6z/VbdIrl+Q==" }, "@walmart/time-clock-mini-app": { "version": "0.5.1", --- 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.12.0", + "@walmart/taskit-mini-app": "0.13.0", "@walmart/time-clock-mini-app": "0.5.1", "@walmart/ui-components": "1.4.0-rc.0", "@walmart/welcomeme-mini-app": "0.52.0",
upgrading taskit version
upgrading taskit version
ad12d58e147b51e1d8c8f435deff8b343a893e23
--- targets/US/package.json @@ -105,7 +105,7 @@ "@walmart/feedback-all-spark-miniapp": "0.9.71", "@walmart/financial-wellbeing-feature-app": "1.26.0", "@walmart/functional-components": "~6.3.28", - "@walmart/global-vpi-mini-app": "1.0.77", + "@walmart/global-vpi-mini-app": "1.1.1", "@walmart/gta-react-native-calendars": "0.7.0", "@walmart/gtp-shared-components": "2.2.4", "@walmart/ims-print-services-ui": "2.15.3", --- yarn.lock @@ -6436,10 +6436,10 @@ __metadata: languageName: node linkType: hard -"@walmart/global-vpi-mini-app@npm:1.0.77": - version: 1.0.77 - resolution: "@walmart/global-vpi-mini-app@npm:1.0.77" - checksum: 10c0/7736c66fc0857a808bfd231e7be9c4b76028a57b1a529f12015e9761c5ed21f2d7e8866804049c29f91e4d9fe77a1149fcef9e85036013edec3851228a67b2a4 +"@walmart/global-vpi-mini-app@npm:1.1.1": + version: 1.1.1 + resolution: "@walmart/global-vpi-mini-app@npm:1.1.1" + checksum: 10c0/c621a3403644b718480f4d013762a801fea85eeb351c832cb7d024eae762b5310ac7b079cb2c79d988843168455c73baa16b7bf01e8971e2a26c1ce250fdcbd6 languageName: node linkType: hard @@ -7027,7 +7027,7 @@ __metadata: "@walmart/feedback-all-spark-miniapp": "npm:0.9.71" "@walmart/financial-wellbeing-feature-app": "npm:1.26.0" "@walmart/functional-components": "npm:~6.3.28" - "@walmart/global-vpi-mini-app": "npm:1.0.77" + "@walmart/global-vpi-mini-app": "npm:1.1.1" "@walmart/gta-react-native-calendars": "npm:0.7.0" "@walmart/gtp-shared-components": "npm:2.2.4" "@walmart/ims-print-services-ui": "npm:2.15.3"
feat: upgrade version global vpi
feat: upgrade version global vpi
c3476cf42500b3a1f6a51cb9a6f86f7dc2d7a46c
--- __tests__/components/ChatWidgetComponent.a11y.test.tsx @@ -1,15 +1,3 @@ -/** - * Accessibility Tests for ChatWidget Component (Messages Button) - * - * JIRA: SMDV-7774 - * WCAG Checkpoint: 4.1.2 Name, Role, Value (Level A) - * - * Tests verify that the Messages button in the roster screen header: - * 1. Has proper accessibilityRole='button' - * 2. Has descriptive accessibilityLabel='View Messages' - * 3. Announces correctly on VoiceOver: "View Messages, button" - */ - import React from 'react'; import {render} from '@testing-library/react-native'; import {ChatWidget} from '../../src/components/ChatWidget/ChatWidgetComponent';
feat(ada): ada updates
feat(ada): ada updates
8165917551edd20702bf9bcc92882072e57de64c
--- targets/US/package.json @@ -86,7 +86,7 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.28.21", "@walmart/associate-listening-mini-app": "1.2.10", - "@walmart/attendance-mini-app": "3.96.2", + "@walmart/attendance-mini-app": "3.142.0", "@walmart/avp-feature-app": "0.10.19", "@walmart/avp-shared-library": "0.10.5", "@walmart/backroom-mini-app": "1.9.0", --- yarn.lock @@ -6416,39 +6416,40 @@ __metadata: languageName: node linkType: hard -"@walmart/attendance-mini-app@npm:3.96.2": - version: 3.96.2 - resolution: "@walmart/attendance-mini-app@npm:3.96.2" - dependencies: - "@walmart/wfm-ui": "npm:^0.2.26" - moment-timezone: "npm:0.5.40" +"@walmart/attendance-mini-app@npm:3.142.0": + version: 3.142.0 + resolution: "@walmart/attendance-mini-app@npm:3.142.0" peerDependencies: - "@react-native-community/datetimepicker": ^5.1.0 - "@react-navigation/native": ^6.0.8 - "@react-navigation/stack": ^6.1.1 - "@shopify/flash-list": ^1.6.3 - "@walmart/core-services": ^1.4.9 - "@walmart/gta-react-native-calendars": ^0.6.0 - "@walmart/gtp-shared-components": ^2.0.3 - "@walmart/react-native-env": ^0.2.0 - "@walmart/redux-store": ^3.0.1 - axios: ^0.26.1 - i18next: ^22.0.1 - javascript-time-ago: ^2.5.7 - lodash: ^4.17.20 - react: ^18.2.0 - react-i18next: ^12.0.0 - react-native: ^0.72.6 - react-native-gesture-handler: 2.13.1 - react-native-modal: ^13.0.1 - react-native-reanimated: ^3.5.1 - react-native-vector-icons: ^9.2.0 - react-redux: ^8.0.4 - redux: ^4.1.2 - redux-saga: ^1.2.0 - reselect: ^4.1.0 - wfm-allspark-data-library: ^3.3.0 - checksum: 10c0/4181b03dfdf629d612d305f1a5731673e20af12c3bf2aba14889c32f2e2e3ea509c161472255d30e5056f6444fe2a9e22e4811c941b5de2658697d971726a03b + "@react-native-community/datetimepicker": ">=5.1.0" + "@react-navigation/native": ">=6.0.8" + "@react-navigation/stack": ">=6.1.1" + "@shopify/flash-list": ">=1.6.4" + "@walmart/allspark-foundation": "*" + "@walmart/core-services": ">=1.4.9" + "@walmart/gta-react-native-calendars": ">=0.6.0" + "@walmart/gtp-shared-components": ">=2.0.3" + "@walmart/me-at-walmart-common": "*" + "@walmart/react-native-env": "*" + "@walmart/redux-store": ">=3.0.1" + axios: ">=0.26.1" + eslint-plugin-prettier: ">=5.1.3" + i18next: ">=22.0.1" + javascript-time-ago: ">=2.5.7" + lodash: ">=4.17.20" + moment-timezone: ">=0.5.40" + react: ">=18.2.0" + react-i18next: ">=12.0.0" + react-native: ">=0.73.7" + react-native-gesture-handler: ^2.14.0 + react-native-modal: ">=13.0.1" + react-native-reanimated: ">=3.5.1" + react-native-vector-icons: ">=9.2.0" + react-redux: ">=8.0.4" + redux: ">=4.2.1" + redux-saga: ">=1.2.3" + reselect: ">=4.1.0" + wfm-allspark-data-library: ">=3.3.0" + checksum: 10c0/1bed5aeabdeba015d8c5c5ceea463078921caf895476128186ac2ae460670ba07f5dad35e5d583bac740a0cbdb499444cea79f8dcbb5551f5a7ed21b0f941c2e languageName: node linkType: hard @@ -7421,7 +7422,7 @@ __metadata: "@walmart/ask-sam-chat-components": "npm:^0.2.7" "@walmart/ask-sam-mini-app": "npm:1.28.21" "@walmart/associate-listening-mini-app": "npm:1.2.10" - "@walmart/attendance-mini-app": "npm:3.96.2" + "@walmart/attendance-mini-app": "npm:3.142.0" "@walmart/avp-feature-app": "npm:0.10.19" "@walmart/avp-shared-library": "npm:0.10.5" "@walmart/backroom-mini-app": "npm:1.9.0" @@ -8604,32 +8605,6 @@ __metadata: languageName: node linkType: hard -"@walmart/wfm-ui@npm:^0.2.26": - version: 0.2.27 - resolution: "@walmart/wfm-ui@npm:0.2.27" - dependencies: - "@walmart/moment-walmart": "npm:1.0.3" - lodash: "npm:^4.17.20" - lodash.get: "npm:^4.4.2" - lodash.isequal: "npm:^4.5.0" - lodash.uniqby: "npm:^4.7.0" - react-native-material-menu: "npm:^0.4.2" - react-native-vector-icons: "npm:^7.0.0" - string.prototype.matchall: "npm:^4.0.2" - wm-react-native-vector-icons: "npm:^1.0.26" - peerDependencies: - "@walmart/gtp-shared-components": ">=0.2.2" - i18next: 19.7.0 - moment: ^2.29.4 - react: ^16.13.1 - react-i18next: 11.7.3 - react-native: ^0.63.2 - react-native-modal: ^11.5.6 - xdate: ^0.8.0 - checksum: 10c0/75a5f1472272add7afc0f834f6ac6a69b9889c4a297b6595a29c4733b29aab632d84d4a34869d87a55c3df9d4e22e172eb84210d770f3af52d86a5dd9d617fa2 - languageName: node - linkType: hard - "@walmart/wm-plus-mini-app@npm:1.0.2": version: 1.0.2 resolution: "@walmart/wm-plus-mini-app@npm:1.0.2" @@ -16256,13 +16231,6 @@ __metadata: languageName: node linkType: hard -"lodash.get@npm:^4.4.2": - version: 4.4.2 - resolution: "lodash.get@npm:4.4.2" - checksum: 10c0/48f40d471a1654397ed41685495acb31498d5ed696185ac8973daef424a749ca0c7871bf7b665d5c14f5cc479394479e0307e781f61d5573831769593411be6e - languageName: node - linkType: hard - "lodash.isequal@npm:^4.5.0": version: 4.5.0 resolution: "lodash.isequal@npm:4.5.0" @@ -16298,13 +16266,6 @@ __metadata: languageName: node linkType: hard -"lodash.uniqby@npm:^4.7.0": - version: 4.7.0 - resolution: "lodash.uniqby@npm:4.7.0" - checksum: 10c0/c505c0de20ca759599a2ba38710e8fb95ff2d2028e24d86c901ef2c74be8056518571b9b754bfb75053b2818d30dd02243e4a4621a6940c206bbb3f7626db656 - languageName: node - linkType: hard - "lodash@npm:~4.17.21": version: 4.17.21 resolution: "lodash@npm:4.17.21" @@ -18685,7 +18646,7 @@ __metadata: languageName: node linkType: hard -"prop-types@npm:*, prop-types@npm:15.8.1, prop-types@npm:^15.5.10, prop-types@npm:^15.5.7, prop-types@npm:^15.6.0, prop-types@npm:^15.6.1, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.0, prop-types@npm:^15.8.1": +"prop-types@npm:*, prop-types@npm:15.8.1, prop-types@npm:^15.5.10, prop-types@npm:^15.5.7, prop-types@npm:^15.6.1, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.0, prop-types@npm:^15.8.1": version: 15.8.1 resolution: "prop-types@npm:15.8.1" dependencies: @@ -19340,18 +19301,6 @@ __metadata: languageName: node linkType: hard -"react-native-material-menu@npm:^0.4.2": - version: 0.4.2 - resolution: "react-native-material-menu@npm:0.4.2" - dependencies: - prop-types: "npm:^15.6.0" - peerDependencies: - react: ">= 16.3.0" - react-native: ">= 0.54.0" - checksum: 10c0/f2065ad4ef6792b3c4aa2fbbb743fb70f8125eaa9c02237160d06d941516fc3ede5b0a86001454065976b109f7bcfa8bf9e5be5bee89bb44671b04e2730b87b0 - languageName: node - linkType: hard - "react-native-modal@npm:13.0.1": version: 13.0.1 resolution: "react-native-modal@npm:13.0.1" @@ -21590,7 +21539,7 @@ __metadata: languageName: node linkType: hard -"string.prototype.matchall@npm:>=4.0.2, string.prototype.matchall@npm:^4.0.12, string.prototype.matchall@npm:^4.0.2": +"string.prototype.matchall@npm:>=4.0.2, string.prototype.matchall@npm:^4.0.12": version: 4.0.12 resolution: "string.prototype.matchall@npm:4.0.12" dependencies: @@ -23879,17 +23828,6 @@ __metadata: languageName: node linkType: hard -"wm-react-native-vector-icons@npm:^1.0.26": - version: 1.0.33 - resolution: "wm-react-native-vector-icons@npm:1.0.33" - dependencies: - lodash: "npm:^4.0.0" - prop-types: "npm:^15.6.2" - yargs: "npm:^13.2.2" - checksum: 10c0/5c7edb5e8d7d8ebc4a426260e3b322654bceba42cf6779bd1d28bc6f858007ecb0c0c1c69f2c2842b0f17509fb248862d6e64e23012c11b8e28b41232abfae1a - languageName: node - linkType: hard - "wonka@npm:^4.0.14": version: 4.0.15 resolution: "wonka@npm:4.0.15"
Update attendance mini app version.
Update attendance mini app version.
aed2be982bf57438b532e347846fe32c7c708179
--- packages/allspark-foundation/src/Container/AllsparkContainer.tsx @@ -125,7 +125,7 @@ export class AllsparkContainer< */ constructor(id: string, config: AllsparkContainerConfig<E, T>) { if (!id || id.length < 1) { - throw new Error('AllsparkContainer Intilization Error: id is required'); + throw new Error('AllsparkContainer Initialization Error: id is required'); } if (!config.environment) { throw new Error( @@ -134,7 +134,7 @@ export class AllsparkContainer< } if (!config.services) { throw new Error( - 'AllsparkContainer Intilization Error: services is required' + 'AllsparkContainer Initialization Error: services is required' ); } this.id = id; @@ -399,59 +399,37 @@ export class AllsparkContainer< }); // Connects all dynamic services to their global instances. - if (!this.config.services.auth) { - throw Error( - 'AllsparkContainer Intilization Error: auth is required in services' + const requiredServices: Array< + keyof AllsparkContainerConfig<E, T>['services'] + > = [ + 'auth', + 'clock', + 'config', + 'device', + 'logger', + 'navConfig', + 'site', + 'telemetry', + 'user', + ]; + const missingServices = requiredServices.filter( + (service) => !this.config.services[service] + ); + if (missingServices.length > 0) { + throw new Error( + `AllsparkContainer Initialization Error: Missing required services: ${missingServices.join( + ', ' + )}` ); } AuthServiceCreator(this.config.services.auth); - if (!this.config.services.clock) { - throw Error( - 'AllsparkContainer Intilization Error: clock is required in services' - ); - } ClockServiceCreator(this.config.services.clock); - if (!this.config.services.config) { - throw Error( - 'AllsparkContainer Intilization Error: config is required in services' - ); - } ConfigServiceCreator(this.config.services.config); - if (!this.config.services.device) { - throw Error( - 'AllsparkContainer Intilization Error: device is required in services' - ); - } DeviceServiceCreator(this.config.services.device); - if (!this.config.services.logger) { - throw Error( - 'AllsparkContainer Intilization Error: logger is required in services' - ); - } LoggerServiceCreator(this.config.services.logger); - if (!this.config.services.navConfig) { - throw Error( - 'AllsparkContainer Intilization Error: navConfig is required in services' - ); - } NavConfigServiceCreator(this.config.services.navConfig); - if (!this.config.services.site) { - throw Error( - 'AllsparkContainer Intilization Error: site is required in services' - ); - } SiteServiceCreator(this.config.services.site); - if (!this.config.services.telemetry) { - throw Error( - 'AllsparkContainer Intilization Error: telemetry is required in services' - ); - } TelemetryServiceCreator(this.config.services.telemetry); - if (!this.config.services.user) { - throw Error( - 'AllsparkContainer Intilization Error: user is required in services' - ); - } UserServiceCreator(this.config.services.user); AllsparkReduxStore.dispatch(
fix: optimized code for initialize and fix typos
fix: optimized code for initialize and fix typos
f51c8b6516cccf69012b23474a6e4b84f1d2177c
--- __tests__/__mocks__/@walmart/time-clock-mini-app.js @@ -5,4 +5,5 @@ module.exports = { TorReviewScreen: 'TorReviewScreen', TorSubmissionScreen: 'TorSubmissionScreen', ClockAppSelectors: 'ClockAppSelectors', + AttendanceModalScreen: 'AttendanceModalScreen', }; --- __tests__/navigation/AssociateHallwayNav/Tabs/__snapshots__/HomeStackNavTest.tsx.snap @@ -59,6 +59,7 @@ exports[`HomeStackNav matches snapshot 1`] = ` name="timeClockTabs" /> <Screen + component="AttendanceModalScreen" name="modalScreen" options={ Object { @@ -238,6 +239,7 @@ exports[`HomeStackNav matches snapshot when user is not present 1`] = ` name="timeClockTabs" /> <Screen + component="AttendanceModalScreen" name="modalScreen" options={ Object { --- __tests__/navigation/AssociateHallwayNav/Tabs/__snapshots__/MyTeamStackNavTest.tsx.snap @@ -25,6 +25,7 @@ exports[`MyTeamStackNav matches snapshot 1`] = ` name="timeClock" /> <Screen + component="AttendanceModalScreen" name="modalScreen" options={ Object { --- __tests__/navigation/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -139,6 +139,7 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects name="torReview" /> <Screen + component="AttendanceModalScreen" name="modalScreen" options={ Object { --- src/navigation/AssociateHallwayNav/MainStackNav.tsx @@ -29,7 +29,7 @@ import { TimeClockScreen, TorReviewScreen, TorSubmissionScreen, - ModalScreen, + AttendanceModalScreen, } from '@walmart/time-clock-mini-app'; import {InboxScreen} from '@walmart/inbox-mini-app'; import {ModFlexMiniApp} from '@walmart/mod-flex-mini-app'; @@ -209,7 +209,7 @@ export const MainStackNav = () => { <MainStack.Screen name='modalScreen' - component={ModalScreen} + component={AttendanceModalScreen} options={{ presentation: 'transparentModal', headerShown: false, --- src/navigation/AssociateHallwayNav/Tabs/HomeStackNav.tsx @@ -35,7 +35,7 @@ import { import {ScheduleMiniApp} from '@walmart/schedule-mini-app'; import {useBadgesCount, InboxScreen} from '@walmart/inbox-mini-app'; import { - ModalScreen, + AttendanceModalScreen, NewTorScreen, TimeClockTabs, TorInboxScreen, @@ -159,7 +159,7 @@ export const HomeStackNav = () => { <HomeStack.Screen name='modalScreen' - component={ModalScreen} + component={AttendanceModalScreen} options={{ presentation: 'transparentModal', headerShown: false, --- src/navigation/AssociateHallwayNav/Tabs/MyTeamStackNav.tsx @@ -7,7 +7,7 @@ import { PushToTalkMiniApp, } from '@walmart/push-to-talk-mini-app'; import { - ModalScreen, + AttendanceModalScreen, NewTorScreen, TimeClockScreen, TorReviewScreen, @@ -41,7 +41,7 @@ export const MyTeamStackNav = () => { <MyTeamStack.Screen name='modalScreen' - component={ModalScreen} + component={AttendanceModalScreen} options={{ presentation: 'transparentModal', headerShown: false,
fix: timeclock screen import fix
fix: timeclock screen import fix
f43b19fad7716fb7169be06c450a4efbf90d565a
--- src/constants.ts @@ -1,5 +1,5 @@ export const ROOT_CONTAINER_SCREEN_NAME = 'myTeam'; -export const ROOT_CONTAINER_SCREEN_NAME_MAN_EXP = 'myTeam.rosterDetail'; +export const ROOT_CONTAINER_SCREEN_NAME_MAN_EXP = 'myTeam.allTeams'; export const APP_CONTAINER_SCREEN_NAME = 'myTeam.root'; export const LOCAL_STORAGE_KEY_PREFIX = 'roster-'; export const ASC_SORT = -1; --- src/managerExperience/screens/AllTeamsScreen/AllTeamsScreen.tsx @@ -32,7 +32,7 @@ export const AllTeamsScreen = () => { return <AllTeamsLoadingScreen />; } - if (isErrorFetchingTeams) + if (false) return ( <ErrorScreen errorTitle={t('rosterScreen.allTeamsScreen.somethingWentWrong')} --- src/navigation/index.tsx @@ -55,22 +55,22 @@ export const RosterNavigationForManagerExperience = () => { <RosterStackForManagerExperience.Navigator> {/* TODO: update stack navigation for new roster experience */} <RosterStackForManagerExperience.Screen - name='myTeam.rosterDetail' + name='myTeam.allTeams' options={{ cardStyle: { backgroundColor: 'rgba(0, 0, 0, 0)', }, }} - component={RosterDetailScreen} + component={AllTeamsScreen} /> <RosterStackForManagerExperience.Screen - name='myTeam.allTeams' + name='myTeam.rosterDetail' options={{ cardStyle: { backgroundColor: 'rgba(0, 0, 0, 0)', }, }} - component={AllTeamsScreen} + component={RosterDetailScreen} /> </RosterStackForManagerExperience.Navigator> );
Update roster mini app with right import for hub
Update roster mini app with right import for hub
5e3389d52d840ca36f80af55c2b075d5c36b106d
--- package-lock.json @@ -4253,9 +4253,9 @@ "integrity": "sha512-0M7ySb3F2lKlIfwBosm+Slx3kJvdoEHm5haaZ05WKCJ1hctu0F0CzTGDSbZciXWX92HJBmxvsvr8yi2H435R8g==" }, "@walmart/ims-print-services-ui": { - "version": "0.1.13", - "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-0.1.13.tgz", - "integrity": "sha512-JxHvDDHlr99T3sIHX3ThGdU5UdlVkDGMQecK8drdlB824HcaUp0a47yvSoO8x7Xr/sWUQF45fLYawmvi7Pwl1g==" + "version": "0.1.16", + "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-0.1.16.tgz", + "integrity": "sha512-rsHtoIJTGpR2zLro+B2r94psuK7G83J0XsUoerXiTAhRNDK/Si+oQiGI+xliq7bKRatUlbl6FrzblsILjofyGw==" }, "@walmart/inbox-mini-app": { "version": "0.26.0", @@ -4263,9 +4263,9 @@ "integrity": "sha512-Kcf+R1iCgxHOLCwMoW+zrde/AgO41H65qWBwGxBnKfHzy0JRJcdpZBldAksoK6j2RlT6IvCZoju3WydXMElJyw==" }, "@walmart/iteminfo-mini-app": { - "version": "4.0.10", - "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-4.0.10.tgz", - "integrity": "sha512-soAN6fc3pG8z9uJxU8PhMoZ8nhbGwku8qZZYsNT/I2OEVxGQcFKCgVvIkyrskvH+mkMQqxwJO7g7VzNledoDhQ==" + "version": "4.0.13", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-4.0.13.tgz", + "integrity": "sha512-C3k7LvosXr7vY1sM4n3A9sW9MxzwfkbE7is/mvjZFmKjQCa9CPvZfVjcd8isd6HkzGRWpbGVdHCNbco9WIoehQ==" }, "@walmart/manager-approvals-miniapp": { "version": "0.0.59", --- package.json @@ -83,9 +83,9 @@ "@walmart/gta-react-native-calendars": "0.0.15", "@walmart/gtp-shared-components": "1.2.0", "@walmart/impersonation-mini-app": "1.0.27", - "@walmart/ims-print-services-ui": "0.1.13", + "@walmart/ims-print-services-ui": "0.1.16", "@walmart/inbox-mini-app": "0.26.0", - "@walmart/iteminfo-mini-app": "4.0.10", + "@walmart/iteminfo-mini-app": "4.0.13", "@walmart/manager-approvals-miniapp": "0.0.59", "@walmart/metrics-mini-app": "0.5.21", "@walmart/moment-walmart": "1.0.4",
Item Info fixing the bcl logic for a few items
Item Info fixing the bcl logic for a few items
e1cac33e79b2aadf88be9b7b4d2850ced18ff711
--- android/app/src/main/AndroidManifest.xml @@ -8,7 +8,6 @@ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.RECORD_AUDIO"/> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <queries> <package android:name="com.walmart.sso.app" /> @@ -33,7 +32,6 @@ <application android:name="com.walmart.stores.allspark.beta.MainApplication" android:label="@string/app_name" - android:requestLegacyExternalStorage="true" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="false"
Revert manifest changes
Revert manifest changes
f884b1d6c79387ba9913b10e9bc03909e6007a17
--- __tests__/home/components/GreetingRowV2/BaseImageV2Test.tsx @@ -1,6 +1,11 @@ import React from 'react'; import {render} from '@testing-library/react-native'; -import {BaseImageV2} from '../../../../src/home/components/GreetingRowV2/BaseImageV2'; +import { + BaseImageV2, + renderBirthdayImage, + renderPharmacyOrSupplyChainImage, + renderRegularImage, +} from '../../../../src/home/components/GreetingRowV2/BaseImageV2'; // Mock UserSelectors jest.mock('@walmart/allspark-foundation', () => ({ @@ -185,3 +190,60 @@ describe('BaseImageV2', () => { }); }); +describe('Exported Render Functions', () => { + describe('renderBirthdayImage', () => { + it('renders birthday image with correct testID', () => { + const {getByTestId} = render(<>{renderBirthdayImage()}</>); + expect(getByTestId('BaseImageV2-BirthdayImage')).toBeTruthy(); + }); + + it('renders image with birthday header source', () => { + const {getByTestId} = render(<>{renderBirthdayImage()}</>); + const image = getByTestId('BaseImageV2-BirthdayImage'); + expect(image.props.source).toEqual({uri: 'birthday-header.png'}); + }); + + it('renders with contain resize mode', () => { + const {getByTestId} = render(<>{renderBirthdayImage()}</>); + const image = getByTestId('BaseImageV2-BirthdayImage'); + expect(image.props.resizeMode).toBe('contain'); + }); + }); + + describe('renderPharmacyOrSupplyChainImage', () => { + it('renders pharmacy image when isPharmacyOrVision is true', () => { + const {getByTestId} = render(<>{renderPharmacyOrSupplyChainImage(true, false)}</>); + expect(getByTestId('BaseImageV2-Pharmacy')).toBeTruthy(); + }); + + it('renders supply chain image when isSupplychain is true and isPharmacyOrVision is false', () => { + const {getByTestId} = render(<>{renderPharmacyOrSupplyChainImage(false, true)}</>); + expect(getByTestId('BaseImageV2-SupplyChain')).toBeTruthy(); + }); + + it('renders regular image when both flags are false', () => { + const {getByTestId} = render(<>{renderPharmacyOrSupplyChainImage(false, false)}</>); + expect(getByTestId('BaseImageV2-Image')).toBeTruthy(); + }); + + it('pharmacy takes priority over supply chain when both are true', () => { + const {getByTestId, queryByTestId} = render(<>{renderPharmacyOrSupplyChainImage(true, true)}</>); + expect(getByTestId('BaseImageV2-Pharmacy')).toBeTruthy(); + expect(queryByTestId('BaseImageV2-SupplyChain')).toBeNull(); + }); + }); + + describe('renderRegularImage', () => { + it('renders regular image with correct testID', () => { + const {getByTestId} = render(<>{renderRegularImage()}</>); + expect(getByTestId('BaseImageV2-Image')).toBeTruthy(); + }); + + it('renders PeopleHeaderIcon component', () => { + const {getByTestId} = render(<>{renderRegularImage()}</>); + const image = getByTestId('BaseImageV2-Image'); + expect(image.type).toBe('PeopleHeaderIconHourly'); + }); + }); +}); + --- src/home/components/GreetingRowV2/BaseImageV2.tsx @@ -40,7 +40,7 @@ interface BaseImageProps { // Render birthday image (priority over anniversary when both exist) -const renderBirthdayImage = () => ( +export const renderBirthdayImage = () => ( <View style={styles.imageStyle}> <Image source={Images.birthdayHeader} @@ -53,7 +53,7 @@ const renderBirthdayImage = () => ( // Render default user image based on employment type -const renderPharmacyOrSupplyChainImage = (isPharmacyOrVision: boolean, isSupplychain: boolean) => { +export const renderPharmacyOrSupplyChainImage = (isPharmacyOrVision: boolean, isSupplychain: boolean) => { if (isPharmacyOrVision) { return <PeopleHeaderIconPharmacy style={styles.baseImage} testID="BaseImageV2-Pharmacy" />; } @@ -66,7 +66,7 @@ const renderPharmacyOrSupplyChainImage = (isPharmacyOrVision: boolean, isSupplyc }; // Render Regular Image for Salaried user -const renderRegularImage = () => { +export const renderRegularImage = () => { return <PeopleHeaderIcon style={styles.baseImage} testID="BaseImageV2-Image" />; } @@ -143,5 +143,10 @@ export const BaseImageV2 = (props: BaseImageProps) => { const {hasAnniversary, hasBirthday, anniversaryOffset, isRegularUser, isPharmacyOrVision, isSupplychain} = computedValues; - return <View testID="BaseImageV2-Container">{renderImage(anniversaryData, anniversaryOffset, hasBirthday, hasAnniversary, isRegularUser, isPharmacyOrVision, isSupplychain)}</View>; + const renderedImage = useMemo( + () => renderImage(anniversaryData, anniversaryOffset, hasBirthday, hasAnniversary, isRegularUser, isPharmacyOrVision, isSupplychain), + [anniversaryData, anniversaryOffset, hasBirthday, hasAnniversary, isRegularUser, isPharmacyOrVision, isSupplychain] + ); + + return <View testID="BaseImageV2-Container">{renderedImage}</View>; };
feat(header): address comments
feat(header): address comments
0b76c62926b25881be62e345b1e2249955d0361b
--- src/settings/index.tsx @@ -42,9 +42,7 @@ export const SettingsFeature = new AllsparkFeatureModule(settingsSlice.name, { }, }, translations: { - // @ts-ignore - typed for only two levels deep 'en-US': enUS, - // @ts-ignore - typed for only two levels deep 'es-MX': esMX, }, });
chore: remove comments
chore: remove comments
774704cf92fc453611c71aa847ee277e784819ee
--- package-lock.json @@ -40,7 +40,7 @@ "@walmart/compass-sdk-rn": "3.16.17", "@walmart/config-components": "4.1.0-rc.4", "@walmart/core-services": "~2.0.19", - "@walmart/core-services-allspark": "~2.10.16", + "@walmart/core-services-allspark": "~2.10.19", "@walmart/core-utils": "~2.0.5", "@walmart/core-widget-registry": "~1.2.4", "@walmart/counts-component-miniapp": "0.1.4", @@ -57,7 +57,7 @@ "@walmart/inbox-mini-app": "0.83.3", "@walmart/iteminfo-mini-app": "7.2.2", "@walmart/manager-approvals-miniapp": "0.2.2", - "@walmart/me-field-mini-app": "12.0.21", + "@walmart/me-field-mini-app": "12.0.22", "@walmart/metrics-mini-app": "0.11.5", "@walmart/mod-flex-mini-app": "1.8.6", "@walmart/moment-walmart": "1.0.4", @@ -4958,16 +4958,16 @@ } }, "node_modules/@walmart/core-services-allspark": { - "version": "2.10.16", - "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-2.10.16.tgz", - "integrity": "sha512-ShdDkNeuE597UQDeK5nWXiDg7V2GoUhqJZ4HCiUCwTs5rcqB1Oo9cZZjRS8ncHsVDJ8W5uNAwXHiK+Rw1x+vAQ==", + "version": "2.10.19", + "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-2.10.19.tgz", + "integrity": "sha512-61Fz8deumotM3/s0jZGdkqZ4ryQQrz0pTz/v8EDHmE/zQXrdql83mJl/gtn9E5wVaEhR3qyJKFgOndQBCouEOw==", "license": "ISC", "dependencies": { - "@walmart/allspark-graphql-client": "^1.4.8", - "@walmart/allspark-http-client": "^2.4.15", + "@walmart/allspark-graphql-client": "^1.4.10", + "@walmart/allspark-http-client": "^2.4.17", "@walmart/allspark-utils": "^1.6.1", - "@walmart/core-services": "^2.0.21", - "@walmart/me-at-walmart-athena-queries": "^1.3.9", + "@walmart/core-services": "^2.0.23", + "@walmart/me-at-walmart-athena-queries": "^1.3.11", "crypto-js": "~4.1.1", "jwt-decode": "^3.1.2", "luxon": "^2.4.0", @@ -5444,18 +5444,18 @@ } }, "node_modules/@walmart/me-at-walmart-athena-queries": { - "version": "1.3.9", - "resolved": "https://npme.walmart.com/@walmart/me-at-walmart-athena-queries/-/me-at-walmart-athena-queries-1.3.9.tgz", - "integrity": "sha512-hjsYuXG0Lrqf3MtmEUcZOR7JRJ2LH62atuTYETuWiHGycitMtsUaXiGCMzKmkzm0JFOa8KbHxFMXbEcFMc1o6A==", + "version": "1.3.11", + "resolved": "https://npme.walmart.com/@walmart/me-at-walmart-athena-queries/-/me-at-walmart-athena-queries-1.3.11.tgz", + "integrity": "sha512-5OCtQQiwUtJaoTTlJfZr+aaWKJhU5HWmRjTc+m1yDJ+vvji/W89nbCalNIliYJjDP3JOaP4iQ7zjSSCuoY2UEA==", "license": "ISC", "dependencies": { - "@walmart/allspark-graphql-client": "^1.4.8" + "@walmart/allspark-graphql-client": "^1.4.10" } }, "node_modules/@walmart/me-field-mini-app": { - "version": "12.0.21", - "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-12.0.21.tgz", - "integrity": "sha512-WiFL+L18yyDV0HzOpKv8LMZ+KYSHyMAontahxpNmVL/9snq+oVKrwPuOCP//6H9VoeZTtPWUlPn32CAMs0f8Hg==", + "version": "12.0.22", + "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-12.0.22.tgz", + "integrity": "sha512-hS7iZjc26tvPTLV7oVyuYT1Pt8gYz0KJJcTRxKMF30sq+fCt0c1piVug7A2WxhTb5+aBAPX4p7wBjADvdtNLBw==", "hasInstallScript": true, "peerDependencies": { "@atmt/feedback-component-native": "^8.0.0", @@ -25212,15 +25212,15 @@ } }, "@walmart/core-services-allspark": { - "version": "2.10.16", - "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-2.10.16.tgz", - "integrity": "sha512-ShdDkNeuE597UQDeK5nWXiDg7V2GoUhqJZ4HCiUCwTs5rcqB1Oo9cZZjRS8ncHsVDJ8W5uNAwXHiK+Rw1x+vAQ==", + "version": "2.10.19", + "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-2.10.19.tgz", + "integrity": "sha512-61Fz8deumotM3/s0jZGdkqZ4ryQQrz0pTz/v8EDHmE/zQXrdql83mJl/gtn9E5wVaEhR3qyJKFgOndQBCouEOw==", "requires": { "@walmart/allspark-graphql-client": "^1.4.5", "@walmart/allspark-http-client": "^2.4.13", "@walmart/allspark-utils": "^1.5.2", "@walmart/core-services": "~2.0.19", - "@walmart/me-at-walmart-athena-queries": "^1.3.9", + "@walmart/me-at-walmart-athena-queries": "^1.3.11", "crypto-js": "^3.3.0", "jwt-decode": "^3.1.2", "luxon": "^1.28.0", @@ -25340,17 +25340,17 @@ "version": "0.2.2" }, "@walmart/me-at-walmart-athena-queries": { - "version": "1.3.9", - "resolved": "https://npme.walmart.com/@walmart/me-at-walmart-athena-queries/-/me-at-walmart-athena-queries-1.3.9.tgz", - "integrity": "sha512-hjsYuXG0Lrqf3MtmEUcZOR7JRJ2LH62atuTYETuWiHGycitMtsUaXiGCMzKmkzm0JFOa8KbHxFMXbEcFMc1o6A==", + "version": "1.3.11", + "resolved": "https://npme.walmart.com/@walmart/me-at-walmart-athena-queries/-/me-at-walmart-athena-queries-1.3.11.tgz", + "integrity": "sha512-5OCtQQiwUtJaoTTlJfZr+aaWKJhU5HWmRjTc+m1yDJ+vvji/W89nbCalNIliYJjDP3JOaP4iQ7zjSSCuoY2UEA==", "requires": { "@walmart/allspark-graphql-client": "^1.4.5" } }, "@walmart/me-field-mini-app": { - "version": "12.0.21", - "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-12.0.21.tgz", - "integrity": "sha512-WiFL+L18yyDV0HzOpKv8LMZ+KYSHyMAontahxpNmVL/9snq+oVKrwPuOCP//6H9VoeZTtPWUlPn32CAMs0f8Hg==" + "version": "12.0.22", + "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-12.0.22.tgz", + "integrity": "sha512-hS7iZjc26tvPTLV7oVyuYT1Pt8gYz0KJJcTRxKMF30sq+fCt0c1piVug7A2WxhTb5+aBAPX4p7wBjADvdtNLBw==" }, "@walmart/metrics-mini-app": { "version": "0.11.5", --- package.json @@ -82,7 +82,7 @@ "@walmart/compass-sdk-rn": "3.16.17", "@walmart/config-components": "4.1.0-rc.4", "@walmart/core-services": "~2.0.19", - "@walmart/core-services-allspark": "~2.10.16", + "@walmart/core-services-allspark": "~2.10.19", "@walmart/core-utils": "~2.0.5", "@walmart/core-widget-registry": "~1.2.4", "@walmart/counts-component-miniapp": "0.1.4", @@ -99,7 +99,7 @@ "@walmart/inbox-mini-app": "0.83.3", "@walmart/iteminfo-mini-app": "7.2.2", "@walmart/manager-approvals-miniapp": "0.2.2", - "@walmart/me-field-mini-app": "12.0.21", + "@walmart/me-field-mini-app": "12.0.22", "@walmart/metrics-mini-app": "0.11.5", "@walmart/mod-flex-mini-app": "1.8.6", "@walmart/moment-walmart": "1.0.4",
⬆️ Bump Learning mini app and core-services-allspark
⬆️ Bump Learning mini app and core-services-allspark
626fa3f18bf64e27ac6cd9166b952e8a21bf6e50
--- __tests__/home/components/TaskCard/__snapshots__/TaskClockStatusTeamCard2Test.tsx.snap @@ -143,7 +143,7 @@ exports[`TaskClockStatusTeamCard2 handles loading while data is present 1`] = ` } } > - teams.teamName.taskFoodConsumables + teams.teamName.defaultTeamName </Text> <Text style={ @@ -254,7 +254,7 @@ exports[`TaskClockStatusTeamCard2 shows data on load and navigates on tap 1`] = } } > - teams.teamName.taskFoodConsumables + teams.teamName.defaultTeamName </Text> <Text style={ --- __tests__/home/components/__snapshots__/ErrorComponentTest.tsx.snap @@ -34,7 +34,6 @@ exports[`ErrorComponent matches snapshot if there is no callback provided 1`] = } > errorComponent.errorMessage - </Body> <View accessible={true} @@ -101,7 +100,6 @@ exports[`ErrorComponent matches snapshot; calls retry callback 1`] = ` } > errorComponent.errorMessage - </Body> <View accessible={true} --- ios/Podfile.lock @@ -515,7 +515,7 @@ PODS: - React-Core - react-native-image-resizer (1.4.5): - React-Core - - react-native-logger (1.31.0-rc.1): + - react-native-logger (1.33.0): - React - react-native-loudness (2.0.0): - React @@ -1211,7 +1211,7 @@ SPEC CHECKSUMS: react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a react-native-image-picker: 4bc9ed38c8be255b515d8c88babbaf74973f91a8 react-native-image-resizer: d9fb629a867335bdc13230ac2a58702bb8c8828f - react-native-logger: c9fa5ed890b56e294df7d62c39c2c5564a8ae2ea + react-native-logger: 0bcf50232fdc8dbf2feb0d76f18b97ca722463eb react-native-loudness: 38527e7e42c3be3e4ea3d8aace2621a8eb9cafda react-native-maps: 085f614cf14d3637b2048bb9752da5b1c27c2886 react-native-netinfo: f80db8cac2151405633324cb645c60af098ee461 --- package-lock.json @@ -51,7 +51,7 @@ "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16", "@walmart/gtp-shared-components": "2.0.4", - "@walmart/impersonation-mini-app": "1.11.0", + "@walmart/impersonation-mini-app": "1.17.2", "@walmart/ims-print-services-ui": "2.0.6", "@walmart/inbox-mini-app": "0.81.13", "@walmart/iteminfo-mini-app": "7.0.8", @@ -5278,9 +5278,9 @@ "license": "UNLICENSED" }, "node_modules/@walmart/impersonation-mini-app": { - "version": "1.11.0", - "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.11.0.tgz", - "integrity": "sha512-jytXe4i0C9GXvPCm6nB26ILZVkcSsBmcdykmGmlFKB4Q/d5i9imtLmFHLfhd6gxU7ZeBoKMJvymF5tWQbI6QoQ==", + "version": "1.17.2", + "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.17.2.tgz", + "integrity": "sha512-IDynuXjrS0zBA66Fq8ZAHj6xx4Hllx1cS8xLpDFvon/29MB84aO/pY2QKTXmldOP5/GbW+buGk89mtsQ6jYUJQ==", "peerDependencies": { "@react-native-community/masked-view": ">=0.1.10", "@react-native-community/picker": ">=1.8.1", @@ -25144,9 +25144,9 @@ } }, "@walmart/impersonation-mini-app": { - "version": "1.11.0", - "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.11.0.tgz", - "integrity": "sha512-jytXe4i0C9GXvPCm6nB26ILZVkcSsBmcdykmGmlFKB4Q/d5i9imtLmFHLfhd6gxU7ZeBoKMJvymF5tWQbI6QoQ==" + "version": "1.17.2", + "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.17.2.tgz", + "integrity": "sha512-IDynuXjrS0zBA66Fq8ZAHj6xx4Hllx1cS8xLpDFvon/29MB84aO/pY2QKTXmldOP5/GbW+buGk89mtsQ6jYUJQ==" }, "@walmart/ims-print-services-ui": { "version": "2.0.6", --- package.json @@ -93,7 +93,7 @@ "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16", "@walmart/gtp-shared-components": "2.0.4", - "@walmart/impersonation-mini-app": "1.11.0", + "@walmart/impersonation-mini-app": "1.17.2", "@walmart/ims-print-services-ui": "2.0.6", "@walmart/inbox-mini-app": "0.81.13", "@walmart/iteminfo-mini-app": "7.0.8", --- src/home/components/ErrorComponent.tsx @@ -1,4 +1,4 @@ -import React, {FC} from 'react'; +import React, {FC, useCallback} from 'react'; import {StyleSheet} from 'react-native'; import {useTranslation} from 'react-i18next'; import {View, TouchableOpacity} from 'react-native'; @@ -38,12 +38,13 @@ export interface ErrorComponentProps { export const ErrorComponent: FC<ErrorComponentProps> = (props) => { const {retryCallback = () => {}} = props; const {t} = useTranslation(['home']); + const handleOnPress = useCallback(() => retryCallback(), [retryCallback]); return ( <View style={styles.container}> <WarningIcon style={styles.image} /> - <Body style={styles.body}>{t('errorComponent.errorMessage')} </Body> - <TouchableOpacity onPress={retryCallback}> + <Body style={styles.body}>{t('errorComponent.errorMessage')}</Body> + <TouchableOpacity onPress={handleOnPress}> <Body style={styles.underline}>{t('errorComponent.retry')}</Body> </TouchableOpacity> </View> --- src/home/components/TaskCard/TaskClockStatusTeamCard2.tsx @@ -25,7 +25,7 @@ export const TaskClockStatusTeamCard2: FC<TaskCardProps> = (props) => { const env = useEnvironment(); const navigation = useNavigation(); - const {t} = useTranslation(['home']); + const {t, i18n} = useTranslation(['home']); const storeId = useSelector(UserSelectors.getUserWorkingSite); const teamIds = useSelector(UserSelectors.getUserTeamIds); //"Sup_0000053992" //Sup_0000041243 const countryCode = useSelector(UserSelectors.getUserCountryCode); @@ -66,9 +66,15 @@ export const TaskClockStatusTeamCard2: FC<TaskCardProps> = (props) => { // team name in image file & translation file is same and w/o any whitespace or special character. // Replace everything(' ' , '/', etc) but alphabets to make it one word const teamImage = teamName?.replace(/[^a-zA-Z]/g, ''); - const teamDisplayText = teamName - ? t(`teams.teamName.task${teamImage}`, {defaultValue: teamName}) - : `Store #${storeId}`; + let teamDisplayText = `Store #${storeId}`; + if (teamName) { + teamDisplayText = + i18n?.language === 'en-US' + ? t('teams.teamName.defaultTeamName', {teamName}) + : t(`teams.teamName.task${teamImage}`, { + defaultValue: teamName, + }); + } const onReload = async () => { onRefreshStart(refreshKey); --- src/translations/en-US.ts @@ -316,28 +316,7 @@ export const enUS_home = { site: 'Site', store: 'Store', teamName: { - taskApparel: 'Apparel team', - taskAssetProtection: 'Asset Protection team', - taskAutoCareCenter: 'Auto Care Center team', - taskDeliBakery: 'Deli & Bakery team', - taskDigital: 'Digital team', - taskDigitalOvernight: 'Digital team', - taskEntertainment: 'Entertainment team', - taskFoodConsumables: 'Food & Consumables team', - taskFrontEndCheckout: 'Front End team', - taskFrontEndService: 'Front End team', - taskFuel: 'Fuel team', - taskHardlines: 'Hardlines team', - taskHome: 'Home team', - taskMeatProduce: 'Meat & Produce team', - taskPharmacy: 'Pharmacy team', - taskRemodel: 'Remodel team', - taskSeasonal: 'Seasonal team', - taskStockingDay: 'Stocking Day team', - taskStockingON: 'Stocking Overnight team', - taskStockingOvernight: 'Stocking Overnight team', - taskVision: 'Vision team', - taskVisionCenter: 'Vision Center team', + defaultTeamName: '{{teamName}} team', }, teamTaskTitle: 'My team', teamTaskTitle_site: 'My site',
bug: fixed retry callback on error component and fixed english translations for team names
bug: fixed retry callback on error component and fixed english translations for team names
b70c2a7bf124e650e9a1844aaac655eaef6a2134
--- __tests__/components/WarningBanner.test.tsx @@ -18,7 +18,7 @@ jest.mock('react-redux', () => ({ jest.mock('@walmart/gtp-shared-components-3', () => { const React = require('react'); const {View, TouchableOpacity, Text} = require('react-native'); - + return { Banner: ({children, testID, onClose}: any) => React.createElement( --- __tests__/setup.ts @@ -48,7 +48,7 @@ jest.mock('@walmart/allspark-foundation/Components', () => ({ jest.mock('@walmart/allspark-foundation/Components', () => ({ AllsparkContext: { - Provider: jest.fn(({ children }) => children), + Provider: jest.fn(({children}) => children), Consumer: jest.fn(), }, useAllsparkContext: jest.fn(() => ({})),
feat(ui): update lint fix
feat(ui): update lint fix
7547c702a86cd8d655f500bd7a349f2631ece124
--- graphql.yml @@ -1,6 +1,9 @@ schemaVersion: '1.0.0' enableGating: true teamRostersProductId: 1824 +notify: + slack: + channelName: 'smdv-miniapp' applications: - name: 'ROSTER-MINIAPP' applicationKey: 'ROSTER-MINIAPP'
feat(ui): slack notif
feat(ui): slack notif
c8f4f416171d0c3bfb4ba5c3e62bd7ee1b94cae6
--- package.json @@ -121,7 +121,7 @@ "@walmart/schedule-mini-app": "0.33.0", "@walmart/settings-mini-app": "1.12.0", "@walmart/shelfavailability-mini-app": "1.5.11", - "@walmart/taskit-mini-app": "0.49.12", + "@walmart/taskit-mini-app": "0.49.12", "@walmart/time-clock-mini-app": "2.25.0", "@walmart/ui-components": "1.9.0", "@walmart/welcomeme-mini-app": "0.76.0",
format package.json
format package.json
af52caefbffff7190e502ffad02604b8a335d76b
--- example/src/feature1/components.tsx @@ -46,13 +46,7 @@ declare global { } export const Feature1Components = { - containers: { - 'feature1.container': Feature1ComponentContainer, - }, - dynamic: { - 'feature1.dynamic': Feature1DynamicComponent, - }, - shared: { - 'feature1.shared': Feature1SharedComponent, + 'feature1.shared': { + component: Feature1SharedComponent, }, }; --- packages/allspark-foundation/src/Feature/AllsparkFeatureModule.tsx @@ -24,10 +24,7 @@ import { InferRecordKey, } from './types'; import { ActiveAllsparkContainer } from '../Container/ActiveContainerManager'; -import { - AllsparkComponentContainers, - AllsparkDynamicComponents, -} from '../Components'; +import { AllsparkComponentContainers } from '../Components'; import { AllsparkSharedComponents } from '../Components/SharedComponents'; /** @@ -335,16 +332,18 @@ export class AllsparkFeatureModule< this._connectedMap.components = true; this._resourceMap.components = components; - Object.entries(components.containers || {}).forEach(([id, container]) => { - AllsparkComponentContainers.register(id, container); - }); + Object.entries(components).forEach(([id, config]) => { + const { containerId, shared = true, component } = config; - Object.entries(components.dynamic || {}).forEach(([id, component]) => { - AllsparkDynamicComponents.register(id, component); - }); + // Add component to container if specified + if (containerId) { + AllsparkComponentContainers.add(containerId, id, component); + } - Object.entries(components.shared || {}).forEach(([id, component]) => { - AllsparkSharedComponents.register(id, component); + // Add component to shared if specified + if (shared) { + AllsparkSharedComponents.register(id, component); + } }); } --- packages/allspark-foundation/src/Feature/README.md @@ -221,25 +221,26 @@ A capability creator [createTranslations](#createtranslations) is provided on th #### `config.components` -An object that defines component containers, dynamic components, and shared components to be utilized by other features. +An object that defines shared components. -`containers` is a mapping of container name to `ComponentContainer` instance. See the [Component Container Guide](../Components/ComponentContainers.md) for more info on creating and using component containers. +This is a mapping of the component id with its configuration. -`dynamic` is a mapping of component name to `DynamicComponent` instance. See the [Dynamic Component Guide](../Components/DynamicComponents.md) for more info on creating and using dynamic components. - -`shared` is a mapping of component name to component instance. See the [Shared Component Guide](../Components/SharedComopnents.md) for more info on creating and using shared components. +| Property | Type | Required | Default | Description | +| ------------- | ------------- | ------------- | ------------- | ------------- | +| component | FC\<any> | true | N/A | The component to share +| containerId | string | false | undefined | Which ComponentContainer, if any, should the component be added to +| shared | boolean | false | true | If component should be added to the global AllsparkSharedComponents instance. ```typescript MyFeature.createModule({ components: { - containers: { - 'MyFeature.HomeContainer': HomeContainer, // ComponentContainer<any>; - }, - dynamic: { - 'MyFeature.DynamicList': DynamicList, // DynamicComponent<any>; + 'MyFeature.Component1': { + component: Component1, }, - shared: { - 'MyFeature.CommonComponent': CommonComponent, // ComponentType<any> + 'MyFeature.Component2': { + component: Component2, + containerId: 'OtherFeature.Container', + shared: false, }, }, // ...etc --- packages/allspark-foundation/src/Feature/types.ts @@ -13,8 +13,6 @@ import { ContainerEventListeners, ContainerFlowTypes, } from '../Container/types'; -import { ComponentContainer } from '../Components/ComponentContainers'; -import { DynamicComponent } from '../Components/DynamicComponents'; export type IAllsparkFeatureListeners = { feature?: Partial<FeatureEventListeners>; @@ -69,17 +67,19 @@ export type IAllsparkFeatureRedux = { export type IAllsparkFeatureComponents = { /** - * @description Component containers the feature creates/renders + * @description Components to be shared between features. */ - containers?: Record<string, ComponentContainer<any>>; - /** - * @description Dynamic components the feature creates/renders - */ - dynamic?: Record<string, DynamicComponent<any>>; - /** - * @description Shared components the feature provides - */ - shared?: Record<string, FC<any>>; + [key: string]: { + component: FC<any>; + /** + * @description Signals component should be registered to a component container + */ + containerId?: string; + /** + * @description If the component should be accessible via AllsparkSharedComponents + */ + shared?: boolean; + }; }; /**
refactor: change feature module components implementation for shared and container registration only
refactor: change feature module components implementation for shared and container registration only
d3746bda581e4591194a6e2470d130bb123216ce
--- package-lock.json @@ -44,7 +44,7 @@ "@walmart/attendance-mini-app": "1.62.13", "@walmart/compass-sdk-rn": "5.18.15", "@walmart/config-components": "4.2.16", - "@walmart/copilot-mini-app": "3.42.3", + "@walmart/copilot-mini-app": "^3.46.0", "@walmart/core-services": "~2.3.0", "@walmart/core-services-allspark": "~2.13.4", "@walmart/core-utils": "~2.0.5", @@ -8586,9 +8586,9 @@ } }, "node_modules/@walmart/copilot-mini-app": { - "version": "3.42.3", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.42.3.tgz", - "integrity": "sha512-XzUKBd1CbDEGa93htmrbweLli7srkwvDSfLInRsJge9AmQLvox0BrL2cTkt3YoUbS4h9IcT1APLIwfH+kPvoDA==", + "version": "3.46.0", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.46.0.tgz", + "integrity": "sha512-WrabSwBVYIn+SIyGiALnqAXrlzx0A9Cb6ST1PvRSNX3Xps2B3JWBXGN1cxQqUBwJFfa9Kes2WnVVIA98HSfryA==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -33058,9 +33058,9 @@ } }, "@walmart/copilot-mini-app": { - "version": "3.42.3", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.42.3.tgz", - "integrity": "sha512-XzUKBd1CbDEGa93htmrbweLli7srkwvDSfLInRsJge9AmQLvox0BrL2cTkt3YoUbS4h9IcT1APLIwfH+kPvoDA==" + "version": "3.46.0", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.46.0.tgz", + "integrity": "sha512-WrabSwBVYIn+SIyGiALnqAXrlzx0A9Cb6ST1PvRSNX3Xps2B3JWBXGN1cxQqUBwJFfa9Kes2WnVVIA98HSfryA==" }, "@walmart/core-services": { "version": "2.3.2", --- package.json @@ -85,7 +85,7 @@ "@walmart/attendance-mini-app": "1.62.13", "@walmart/compass-sdk-rn": "5.18.15", "@walmart/config-components": "4.2.16", - "@walmart/copilot-mini-app": "3.42.3", + "@walmart/copilot-mini-app": "3.46.0", "@walmart/core-services": "~2.3.0", "@walmart/core-services-allspark": "~2.13.4", "@walmart/core-utils": "~2.0.5",
feat(Drop18): bump copilot-mini-app 3.46.0
feat(Drop18): bump copilot-mini-app 3.46.0
602ef8d44c1c174942a43637999a25459d4a17fb
--- package-lock.json @@ -3088,9 +3088,9 @@ "integrity": "sha512-vzirL8LmvVnJdyNGFtqfzf3Pth9kuwqnd0cxllT7Gw3Qil4+snxw6yrC9Iw49jIvUFqjGjfkkFbXPeSqOcCVzw==" }, "@walmart/inbox-mini-app": { - "version": "0.0.93", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.0.93.tgz", - "integrity": "sha512-QuM6wImPS5ytC6omhDCgVtWYbc//uuQoneunKbqlnudiuH7T3TXhakJ3IhUPcAGPWM+tIAFPsnIkPiyzwHAHgA==" + "version": "0.0.94", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.0.94.tgz", + "integrity": "sha512-Nw48GsUKz2HkFr1qjavFld2pryaG9Jzn/QPT9C/xk7UgxTs4UeCmSJEZ99oLeSIV3TA9rgAH8dThkqzwmjP6ew==" }, "@walmart/moment-walmart": { "version": "1.0.4", --- package.json @@ -71,7 +71,7 @@ "@walmart/functional-components": "1.0.27", "@walmart/gtp-shared-components": "^0.2.2", "@walmart/impersonation-mini-app": "1.0.15", - "@walmart/inbox-mini-app": "0.0.93", + "@walmart/inbox-mini-app": "0.0.94", "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.5.4", "@walmart/react-native-env": "^0.1.0",
Fix SSMP-1090
Fix SSMP-1090
aa4c7aa08ea0eadf0fa2ae9c0ff5203897039c90
--- .looper.multibranch.yml @@ -254,11 +254,13 @@ rules: flows: default: - - excludeTools(android, maven, jdk) + - excludeTools(): + - tools(maven = 3.5.4, jdk=8) - echo "default flow not required" pr: - - excludeTools(android, maven, jdk) + - excludeTools(): + - tools(maven = 3.5.4, jdk=8) - npm install - npm run env:dev - npm run lint
Update .looper.multibranch.yml
Update .looper.multibranch.yml
471b3d5cd778ac31d9a8690a0549478bb1902d2c
--- __tests__/navigation/AssociateHallwayNav/Tabs/__snapshots__/HomeStackNavTest.tsx.snap @@ -39,25 +39,6 @@ exports[`HomeStackNav matches snapshot 1`] = ` } } /> - <Screen - component={ - Object { - "AttendanceModalScreen": "AttendanceModalScreen", - "ClockAppSelectors": "ClockAppSelectors", - "NewTorScreen": "NewTorScreen", - "TimeClockScreen": "TimeClockScreen", - "TorInboxScreen": "TorInboxScreen", - "TorReviewScreen": "TorReviewScreen", - "TorSubmissionScreen": "TorSubmissionScreen", - } - } - name="timeClock" - options={ - Object { - "headerShown": false, - } - } - /> <Screen component={ Object { @@ -214,25 +195,6 @@ exports[`HomeStackNav matches snapshot when user is not present 1`] = ` } } /> - <Screen - component={ - Object { - "AttendanceModalScreen": "AttendanceModalScreen", - "ClockAppSelectors": "ClockAppSelectors", - "NewTorScreen": "NewTorScreen", - "TimeClockScreen": "TimeClockScreen", - "TorInboxScreen": "TorInboxScreen", - "TorReviewScreen": "TorReviewScreen", - "TorSubmissionScreen": "TorSubmissionScreen", - } - } - name="timeClock" - options={ - Object { - "headerShown": false, - } - } - /> <Screen component={ Object { --- __tests__/navigation/AssociateHallwayNav/Tabs/__snapshots__/MeStackNavTest.tsx.snap @@ -21,24 +21,5 @@ exports[`MeStackNav matches snapshot 1`] = ` } } /> - <Screen - component={ - Object { - "AttendanceModalScreen": "AttendanceModalScreen", - "ClockAppSelectors": "ClockAppSelectors", - "NewTorScreen": "NewTorScreen", - "TimeClockScreen": "TimeClockScreen", - "TorInboxScreen": "TorInboxScreen", - "TorReviewScreen": "TorReviewScreen", - "TorSubmissionScreen": "TorSubmissionScreen", - } - } - name="timeClockTabs" - options={ - Object { - "headerShown": false, - } - } - /> </Navigator> `; --- __tests__/navigation/AssociateHallwayNav/Tabs/__snapshots__/MyTeamStackNavTest.tsx.snap @@ -21,25 +21,6 @@ exports[`MyTeamStackNav matches snapshot - attendanceminiapp false 1`] = ` } } /> - <Screen - component={ - Object { - "AttendanceModalScreen": "AttendanceModalScreen", - "ClockAppSelectors": "ClockAppSelectors", - "NewTorScreen": "NewTorScreen", - "TimeClockScreen": "TimeClockScreen", - "TorInboxScreen": "TorInboxScreen", - "TorReviewScreen": "TorReviewScreen", - "TorSubmissionScreen": "TorSubmissionScreen", - } - } - name="timeClock" - options={ - Object { - "headerShown": false, - } - } - /> <Screen component={ Object { @@ -97,25 +78,6 @@ exports[`MyTeamStackNav matches snapshot 1`] = ` } } /> - <Screen - component={ - Object { - "AttendanceModalScreen": "AttendanceModalScreen", - "ClockAppSelectors": "ClockAppSelectors", - "NewTorScreen": "NewTorScreen", - "TimeClockScreen": "TimeClockScreen", - "TorInboxScreen": "TorInboxScreen", - "TorReviewScreen": "TorReviewScreen", - "TorSubmissionScreen": "TorSubmissionScreen", - } - } - name="timeClock" - options={ - Object { - "headerShown": false, - } - } - /> <Screen component={ Object {
Update snapshots
Update snapshots
df473a742f3c793dbe4e09bf2586f989de94c405
--- .github/pull_request_template.md @@ -9,9 +9,9 @@ PR/Template Process for Allspark-core: [Link](https://confluence.walmart.com/pag <br/> | Yes | No | -| -------- | +| :--- | :--- | +| [ ] | [ ] | | [ ] | [ ] | -| -------- | ## Please describe the changes, problems and solutions this PR is addressing: <br/>
twicking changes
twicking changes
f64885d77a27a26571a93cff973ce48ded5ea1ff
--- packages/allspark-foundation-hub/src/HubFeature/Shared/Components/PillTeamListItem/style.ts @@ -6,8 +6,7 @@ export const teamListItemStyles = (isSelected: boolean, isSubItem?: boolean) => container: { display: 'flex', padding: 8, - marginLeft: 16, - marginRight: 16, + marginTop: 4, justifyContent: 'space-between', alignItems: 'center', flexDirection: 'row', @@ -15,7 +14,7 @@ export const teamListItemStyles = (isSelected: boolean, isSubItem?: boolean) => borderRadius: 40, borderColor: isSelected ? colors.black : colors.gray['20'], backgroundColor: colors.white, - marginStart: isSubItem ? 40 : 0, + marginStart: isSubItem ? 25 : 0, }, teamOuterContainer: { display: 'flex',
Updating PillTeamListItem styles
Updating PillTeamListItem styles
e9c1b086bbe1864c91cf3d6a18019002be4f8a18
--- src/components/TeamList.tsx @@ -43,6 +43,7 @@ import { } from '../utils/teams'; import {isNil} from 'lodash'; import {RosterActionButton} from './Roster/types'; +import {analytics} from '../logger/Analytics'; const styles = StyleSheet.create({ listItem: { @@ -189,6 +190,12 @@ const TeamItem = (props: { } const onViewTeam = () => { + analytics('viewteam', { + teamName: team?.teamName, + teamID: teamId, + workgroup: team?.workgroup, + workgroupID: team?.workgroupId, + }); if (team?.teamId) { navigation.navigate('myTeam.viewTeam', { teamRoster: teamRoster, @@ -275,8 +282,11 @@ const StoreTeamItem = (props: { const absentCount = rosterData?.filter(associateIsAbsent)?.length ?? 0; const translationContext = useSiteTranslationContext(); - const onViewTeam = () => { + analytics('viewteam', { + teamName: 'Total Store', + teamID: 'TOTAL_STORE', + }); navigation.navigate('myTeam.viewTeam', { teamRoster: rosterData, clockedInCount: clockedInCount,
adding viewteam press event
adding viewteam press event
2b04679b25e54617d1954ad8ac5815a814c9a793
--- package-lock.json @@ -79,7 +79,7 @@ "@walmart/returns-mini-app": "0.6.0", "@walmart/schedule-mini-app": "0.29.0", "@walmart/settings-mini-app": "1.11.0", - "@walmart/shelfavailability-mini-app": "1.4.0", + "@walmart/shelfavailability-mini-app": "1.5.2", "@walmart/taskit-mini-app": "0.48.0", "@walmart/time-clock-mini-app": "0.30.0", "@walmart/ui-components": "1.7.0", @@ -5905,62 +5905,62 @@ } }, "node_modules/@walmart/shelfavailability-mini-app": { - "version": "1.4.0", - "resolved": "https://npme.walmart.com/@walmart/shelfavailability-mini-app/-/shelfavailability-mini-app-1.4.0.tgz", - "integrity": "sha512-RgedUC6dq2H3sFo8TY6tC71l4A4z3CIF6vIwtqM/D6CrCfQvkNZUX+lLUpWmQBfgXnDsAagumiGJmk9akqDDQA==", + "version": "1.5.2", + "resolved": "https://npme.walmart.com/@walmart/shelfavailability-mini-app/-/shelfavailability-mini-app-1.5.2.tgz", + "integrity": "sha512-tDd8OoNfsef38MR5tx5olytV9lphKVT/vGqHegTUGhosR2NjoQZBj0DE8YjGrcIWq/29x7+V/R1Db0iAgnauyQ==", "peerDependencies": { "@react-native-community/async-storage": "^1.12.1", "@react-native-community/eslint-config": "^2.0.0", "@react-native-community/masked-view": "^0.1.10", "@react-native-community/netinfo": "9.3.6", - "@react-native-firebase/analytics": "^14.11.0", - "@react-native-firebase/app": "^14.11.0", - "@react-native-firebase/crashlytics": "^14.11.0", - "@react-native-firebase/database": "^14.11.0", - "@react-native-firebase/firestore": "^14.11.0", - "@react-native-firebase/perf": "^14.11.0", + "@react-native-firebase/analytics": "15.1.1", + "@react-native-firebase/app": "15.1.1", + "@react-native-firebase/crashlytics": "15.1.1", + "@react-native-firebase/database": "15.1.1", + "@react-native-firebase/firestore": "15.1.1", + "@react-native-firebase/perf": "15.1.1", "@react-navigation/native": "^6.0.0", "@react-navigation/stack": "^6.1.0", - "@walmart/config-components": "^3.0.2", - "@walmart/functional-components": "^1.0.34", - "@walmart/gtp-shared-components": "^1.8.6", - "@walmart/impersonation-mini-app": "^1.1.0", - "@walmart/react-native-env": "^0.2.0", - "@walmart/react-native-logger": "^1.29.0", + "@walmart/config-components": "4.0.1", + "@walmart/functional-components": "2.0.6", + "@walmart/gtp-shared-components": "1.8.17", + "@walmart/impersonation-mini-app": "1.4.0", + "@walmart/react-native-env": "0.2.0", + "@walmart/react-native-logger": "1.31.0-rc.1", "@walmart/react-native-scanner-3.0": "0.1.27", - "@walmart/react-native-shared-navigation": "^0.4.0", - "@walmart/react-native-sumo-sdk": "^2.2.1", - "@walmart/redux-store": "^1.1.26", - "@walmart/ui-components": "1.4.0-beta.6", + "@walmart/react-native-shared-navigation": "1.0.2", + "@walmart/react-native-sumo-sdk": "2.4.0-rc.2", + "@walmart/redux-store": "3.1.3", + "@walmart/ui-components": "1.6.0", "apisauce": "^2.1.1", "axios-cache-adapter": "2.7.3", - "i18next": "^19.7.0", + "i18next": "^22.0.1", "jwt-decode": "^3.1.2", "react": "^18.2.0", - "react-i18next": "^11.7.3", + "react-i18next": "^12.0.0", "react-native": "0.70.5", "react-native-check-app-install": "0.0.5", "react-native-connect-sso-redux": "^1.1.1", - "react-native-device-info": "^5.6.5", - "react-native-gesture-handler": "^1.7.0", - "react-native-hyperlink": "0.0.19", - "react-native-modal": "^11.5.6", - "react-native-reanimated": "^1.10.2", - "react-native-safe-area-context": "^3.3.0", - "react-native-screens": "^3.10.0", + "react-native-device-info": "^10.3.0", + "react-native-gesture-handler": "^2.8.0", + "react-native-hyperlink": "0.0.22", + "react-native-modal": "^13.0.1", + "react-native-reanimated": "2.12.0", + "react-native-safe-area-context": "4.3.1", + "react-native-screens": "~3.15.0", "react-native-ssmp-sso-allspark": "1.0.9", "react-native-uuid": "^2.0.1", - "react-native-vector-icons": "^7.0.0", + "react-native-vector-icons": "^9.2.0", "react-native-wm-network": "^0.2.0", "react-native-wm-notification": "^2.0.1", "react-native-wm-telemetry": "^0.3.0", - "react-redux": "^7.2.1", - "redux": "^4.0.5", + "react-redux": "^8.0.4", + "redux": "^4.1.2", "redux-devtools-extension": "^2.13.8", - "redux-saga": "^1.1.3", - "redux-thunk": "^2.3.0", + "redux-saga": "^1.2.0", + "redux-thunk": "^2.4.0", "reduxsauce": "^1.2.0", - "reselect": "^4.0.0", + "reselect": "^4.1.0", "seamless-immutable": "^7.1.4", "xdate": "^0.8.2" } @@ -25100,9 +25100,9 @@ "integrity": "sha512-a9jtaa6Eo6W743723gsnYOAv2HEmIkSsS1whGlyp0muKexTXAiMeeW+HYELwN0czdnXhaevR2C90a+PHLztrxA==" }, "@walmart/shelfavailability-mini-app": { - "version": "1.4.0", - "resolved": "https://npme.walmart.com/@walmart/shelfavailability-mini-app/-/shelfavailability-mini-app-1.4.0.tgz", - "integrity": "sha512-RgedUC6dq2H3sFo8TY6tC71l4A4z3CIF6vIwtqM/D6CrCfQvkNZUX+lLUpWmQBfgXnDsAagumiGJmk9akqDDQA==" + "version": "1.5.2", + "resolved": "https://npme.walmart.com/@walmart/shelfavailability-mini-app/-/shelfavailability-mini-app-1.5.2.tgz", + "integrity": "sha512-tDd8OoNfsef38MR5tx5olytV9lphKVT/vGqHegTUGhosR2NjoQZBj0DE8YjGrcIWq/29x7+V/R1Db0iAgnauyQ==" }, "@walmart/taskit-mini-app": { "version": "0.48.0", --- package.json @@ -121,7 +121,7 @@ "@walmart/returns-mini-app": "0.6.0", "@walmart/schedule-mini-app": "0.29.0", "@walmart/settings-mini-app": "1.11.0", - "@walmart/shelfavailability-mini-app": "1.4.0", + "@walmart/shelfavailability-mini-app": "1.5.2", "@walmart/taskit-mini-app": "0.48.0", "@walmart/time-clock-mini-app": "0.30.0", "@walmart/ui-components": "1.7.0",
SA-312 SA-319 fixed bugs where scanning was occurring when it shouldn't have
SA-312 SA-319 fixed bugs where scanning was occurring when it shouldn't have
c7affc15c88a3bbae9ae7f90b25d203c39c410f4
--- packages/allspark-foundation/src/Translation/client.ts @@ -4,6 +4,7 @@ import { UseTranslationOptions, useTranslation as baseUseTranslation, } from 'react-i18next'; +import { NativeModules, Platform } from 'react-native'; /** * Default configuration for the translation client @@ -123,6 +124,49 @@ export const TranslationClient = (config?: TranslationClientOptions) => { return _config?.supportedLanguages || []; }; + const select = (languageConfig?: { [key: string]: string } | string) => { + if (!languageConfig || typeof languageConfig === 'string') { + return languageConfig; + } + + const currentLanguage = AllsparkTranslationClient.language; + if (!currentLanguage) { + return languageConfig[_config?.lng || 'en-US']; + } + + return ( + languageConfig[currentLanguage] || languageConfig[_config?.lng || 'en-US'] + ); + }; + + const getDeviceLanguage = async () => { + const deviceLanguage = + Platform.OS === 'ios' + ? NativeModules.SettingsManager?.settings?.AppleLocale || + NativeModules.SettingsManager?.settings?.AppleLanguages?.[0] //iOS 13 + : NativeModules.I18nManager?.localeIdentifier; + + // Device languages come in the format en_US | es_US so we're + // checking the first part to map to our current language codes. + const deviceLanguageFormatted = deviceLanguage?.split('_')[0].toUpperCase(); + + if (deviceLanguageFormatted === 'ES') { + return 'es-MX'; + } + + return 'en-US'; + }; + + const syncToDeviceLanguage = async () => { + const deviceLanguage = await getDeviceLanguage(); + + // Change language on translation client (i18n) + const currentLanguage = AllsparkTranslationClient.language; + if (currentLanguage !== deviceLanguage) { + _instance.changeLanguage(deviceLanguage); + } + }; + return Object.assign(_instance, { initialize, isInitialized, @@ -131,6 +175,9 @@ export const TranslationClient = (config?: TranslationClientOptions) => { setDefaultNamespace, getLocaleConfig, getSupportedLanguages, + select, + getDeviceLanguage, + syncToDeviceLanguage, }); };
feat: add select and device language methods to the translation client
feat: add select and device language methods to the translation client
f772cf38bbbe7822acd754601e3b9b8ee7326f18
--- packages/core-services-allspark/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.10.15](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-services-allspark@2.10.14...@walmart/core-services-allspark@2.10.15) (2023-06-07) + +**Note:** Version bump only for package @walmart/core-services-allspark + + + + + ## [2.10.14](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-services-allspark@2.10.13...@walmart/core-services-allspark@2.10.14) (2023-06-06) **Note:** Version bump only for package @walmart/core-services-allspark --- packages/core-services-allspark/package-lock.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services-allspark", - "version": "2.10.14", + "version": "2.10.15", "lockfileVersion": 1, "requires": true, "packages": { --- packages/core-services-allspark/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services-allspark", - "version": "2.10.14", + "version": "2.10.15", "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.10.15
426a1ae35358d6fb6bcb232cd2f57b5585ffb6da
--- packages/me-at-walmart-common/src/index.ts @@ -8,3 +8,5 @@ export * from './utils'; export * from './allspark-extension.types'; export const ME_AT_WALMART = 'Me@Walmart' as const; + +export const IMAGE_BASE_URL = 'https://i5-me.walmartimages.com/images/';
feat: add cdn image base url
feat: add cdn image base url
23764fe339a46499fe6a537b4b31c7007f7d39fd
--- package-lock.json @@ -3217,9 +3217,9 @@ "integrity": "sha512-4VL2h7BKEZNP+QtIaYbQXJ6kpxZdeeCqTA3PvP1L933vlNsilF3y5RO9lCyMsTjWQ+AJ3Ww6gqC/oNDxjTvtGw==" }, "@walmart/time-clock-mini-app": { - "version": "0.3.2", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.3.2.tgz", - "integrity": "sha512-vW/2/tecEEcLFldrkp6xHgRgWjA/tIaDtDXeW91wboKiM4uRIsfJ0V9I+F8zJAzQMIieqwW0valQzDfyEkgGfQ==", + "version": "0.3.3", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.3.3.tgz", + "integrity": "sha512-AIkm2/L7p7AIODV6TFdZpFUqsXa8R2x/Pkuu8ux42DR7Xipp5XuvKLKthI4Yg9Vmsikp0NLOJnA077oEOAM9Yg==", "requires": { "@react-native-community/datetimepicker": "3.0.9", "moment-timezone": "^0.5.31", --- package.json @@ -81,7 +81,7 @@ "@walmart/redux-store": "^1.0.12", "@walmart/schedule-mini-app": "0.2.75", "@walmart/settings-mini-app": "1.2.3", - "@walmart/time-clock-mini-app": "0.3.2", + "@walmart/time-clock-mini-app": "0.3.3", "@walmart/ui-components": "1.1.14", "@walmart/welcomeme-mini-app": "0.21.0", "@walmart/wfm-ui": "^0.1.50",
Fixed crash GTA-87905
Fixed crash GTA-87905
fbbb223fa6098344225afb5891b366a6ff9b45d9
--- package-lock.json @@ -36,7 +36,7 @@ "@walmart/allspark-neon-core": "0.1.31", "@walmart/amp-mini-app": "0.2.13", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.3.51", + "@walmart/ask-sam-mini-app": "1.3.52", "@walmart/attendance-mini-app": "0.33.0", "@walmart/config-components": "4.0.1", "@walmart/core-services": "~1.4.11", @@ -4731,9 +4731,9 @@ } }, "node_modules/@walmart/ask-sam-mini-app": { - "version": "1.3.51", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.3.51.tgz", - "integrity": "sha512-yLptLK/DwzghLhIGoLG4fGzM1wz+xo3yHKzH+wqjYZJPO9aqv8SS4/QWj1GZEQGbHwsmWmk0yupUkOdp+JxSig==", + "version": "1.3.52", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.3.52.tgz", + "integrity": "sha512-ZPSOiv1FnocwuQJA4ilMNcIXwSNyveV7uGKLllwlZIaiv6GGPTH58ZwMJjHl+yK8/QvIq/ETYO9vxc52TUyWsA==", "license": "NONE", "dependencies": { "apisauce": "^1.1.2", @@ -25026,9 +25026,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "1.3.51", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.3.51.tgz", - "integrity": "sha512-yLptLK/DwzghLhIGoLG4fGzM1wz+xo3yHKzH+wqjYZJPO9aqv8SS4/QWj1GZEQGbHwsmWmk0yupUkOdp+JxSig==", + "version": "1.3.52", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.3.52.tgz", + "integrity": "sha512-ZPSOiv1FnocwuQJA4ilMNcIXwSNyveV7uGKLllwlZIaiv6GGPTH58ZwMJjHl+yK8/QvIq/ETYO9vxc52TUyWsA==", "requires": { "apisauce": "^1.1.2", "axios-cache-adapter": "^2.7.3", --- package.json @@ -79,7 +79,7 @@ "@walmart/allspark-neon-core": "0.1.31", "@walmart/amp-mini-app": "0.2.13", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.3.51", + "@walmart/ask-sam-mini-app": "1.3.52", "@walmart/attendance-mini-app": "0.33.0", "@walmart/config-components": "4.0.1", "@walmart/core-services": "~1.4.11",
Ask Sam Version update
Ask Sam Version update
2876a127f452ca2377ef1aa291f5a942cc055ccd
--- .looper.yml @@ -87,11 +87,11 @@ flows: - (name Publish from Package) HUSKY=0 npx lerna publish from-package --yes publishPrerelease: - - call: preparePackages + - call: preparePublish - (name Publish From Changes) HUSKY_SKIP_HOOKS=1 npx lerna publish --yes --conventional-prerelease publishGraduate: - - call: preparePackages + - call: preparePublish - (name Publish From Changes) HUSKY_SKIP_HOOKS=1 npx lerna publish --yes --conventional-graduate sonar:
chore: fix incorrect looper flow reference
chore: fix incorrect looper flow reference
c054aba5a0b82bdf6f8f208587a38d6e7e3021af
--- __tests__/__mocks__/@walmart/money-auth-shared-components.js @@ -0,0 +1,4 @@ +module.exports = { + __esModule: true, + AuthScreen: 'AuthScreen', +}; --- __tests__/navigation/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -116,6 +116,14 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects component="PayStubMiniApp" name="paystub" /> + <Screen + name="money.auth" + options={ + Object { + "headerShown": true, + } + } + /> <Screen component="FWB" name="FWB" @@ -494,6 +502,14 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects component="PayStubMiniApp" name="paystub" /> + <Screen + name="money.auth" + options={ + Object { + "headerShown": true, + } + } + /> <Screen component="FWB" name="FWB"
update test case
update test case
8eadf406cb0c244f6498b94f25563a4da0195834
--- __tests__/harness/redux/mockState/mockUsers/hourlyUser.ts @@ -2,40 +2,33 @@ import {Team, User} from '@walmart/redux-store'; export const teamState: Team[] = [ { - members: [ - '999991712', - '999996723', - '999995423', - '999992253', - '999991280', - '999992316', - ], + members: ['999991712', '999996723', '999995423', '999992253', '999991280'], site: '100', teamId: '1000333', teamName: 'Stocking ON', membership: [ { - win: '100081712', + win: '999991712', role: 'TA', baseTeam: true, }, { - win: '100986723', + win: '999996723', role: 'TA', baseTeam: true, }, { - win: '101015423', + win: '999995423', role: 'TA', baseTeam: true, }, { - win: '101522253', + win: '999992253', role: 'TA', baseTeam: true, }, { - win: '102321280', + win: '999991280', role: 'TA', baseTeam: true, }, @@ -57,7 +50,7 @@ export const hourlyUserData: User = { siteId: '100', title: 'TA SALESFLOOR', regionNumber: '42', - jobCode: '["1@635@07440@"]', + jobCode: '["8@888@88888@"]', secondaryJobCode: undefined, homeSite: '100', workingSite: '100', --- __tests__/harness/redux/mockState/mockUsers/hourlyUser.ts @@ -2,40 +2,33 @@ import {Team, User} from '@walmart/redux-store'; export const teamState: Team[] = [ { - members: [ - '999991712', - '999996723', - '999995423', - '999992253', - '999991280', - '999992316', - ], + members: ['999991712', '999996723', '999995423', '999992253', '999991280'], site: '100', teamId: '1000333', teamName: 'Stocking ON', membership: [ { - win: '100081712', + win: '999991712', role: 'TA', baseTeam: true, }, { - win: '100986723', + win: '999996723', role: 'TA', baseTeam: true, }, { - win: '101015423', + win: '999995423', role: 'TA', baseTeam: true, }, { - win: '101522253', + win: '999992253', role: 'TA', baseTeam: true, }, { - win: '102321280', + win: '999991280', role: 'TA', baseTeam: true, }, @@ -57,7 +50,7 @@ export const hourlyUserData: User = { siteId: '100', title: 'TA SALESFLOOR', regionNumber: '42', - jobCode: '["1@635@07440@"]', + jobCode: '["8@888@88888@"]', secondaryJobCode: undefined, homeSite: '100', workingSite: '100',
more data obfuscation
more data obfuscation
c73d7241f7f6c7ff029e95266d4540763437841e
--- src/screens/SearchScreen.tsx @@ -21,7 +21,6 @@ import {AssociateListItem} from '../components/Roster/AssociateListItem'; import namecase from 'namecase'; import {useDispatch, useSelector} from 'react-redux'; import {rosterSlice} from '../redux/reducer'; -import {getEncryptedUserId} from '../redux/selectors'; import {navigateToMessageScreen} from '@walmart/wmconnect-mini-app'; import {SiteSelectors} from '@walmart/redux-store'; import {ROSTER_I18N_NAMESPACE} from '../translations';
Integrate message button
Integrate message button
0237b0f07fa0a52879e4141763e103331d18b1e1
--- package.json @@ -148,7 +148,7 @@ "@walmart/time-clock-mini-app": "2.353.0", "@walmart/topstock-mini-app": "patch:@walmart/topstock-mini-app@npm%3A1.9.7#~/.yarn/patches/@walmart-topstock-mini-app-npm-1.9.7-e6400c510e.patch", "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.15.11#~/.yarn/patches/@walmart-ui-components-npm-1.15.11-19ccf914c5.patch", - "@walmart/welcomeme-mini-app": "0.90.3", + "@walmart/welcomeme-mini-app": "0.93.0", "@walmart/wfm-ui": "0.8.7", "@walmart/wm-plus-mini-app": "0.12.20", "@walmart/wmconnect-mini-app": "1.1.6", --- yarn.lock @@ -7310,9 +7310,9 @@ __metadata: languageName: node linkType: hard -"@walmart/welcomeme-mini-app@npm:0.90.3": - version: 0.90.3 - resolution: "@walmart/welcomeme-mini-app@npm:0.90.3" +"@walmart/welcomeme-mini-app@npm:0.93.0": + version: 0.93.0 + resolution: "@walmart/welcomeme-mini-app@npm:0.93.0" peerDependencies: "@react-navigation/native": ^6.0.0 "@react-navigation/stack": ^6.1.0 @@ -7320,7 +7320,7 @@ __metadata: "@walmart/gtp-shared-components": ^2.0.0 react: ^18.2.0 react-native: ~0.70.5 - checksum: 10c0/1c48f7f4b65a8bd2749943903217b9e993081840f51572ea41b78afd53f9a6f2a80d88812f91a6b61f93bb16c40943695e09b87d57b8c3a4ecf76d6e1a528465 + checksum: 10c0/76720618ef5331141930b72440d92542d618f8923dfbc97561bd09480e0b6caa33a1d34f456c0e8aad826ef1236296aa1f6b1c80a9e79dd06844a4b92f16a8f5 languageName: node linkType: hard @@ -7788,7 +7788,7 @@ __metadata: "@walmart/time-clock-mini-app": "npm:2.353.0" "@walmart/topstock-mini-app": "patch:@walmart/topstock-mini-app@npm%3A1.9.7#~/.yarn/patches/@walmart-topstock-mini-app-npm-1.9.7-e6400c510e.patch" "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.15.11#~/.yarn/patches/@walmart-ui-components-npm-1.15.11-19ccf914c5.patch" - "@walmart/welcomeme-mini-app": "npm:0.90.3" + "@walmart/welcomeme-mini-app": "npm:0.93.0" "@walmart/wfm-ui": "npm:0.8.7" "@walmart/wm-plus-mini-app": "npm:0.12.20" "@walmart/wmconnect-mini-app": "npm:1.1.6"
feat: bumping WelcomeMe to version 0.93.0 for drop 22
feat: bumping WelcomeMe to version 0.93.0 for drop 22
9b89c48f00ffc77567519cf886f17121c5696ca8
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.24.0", + "version": "2.25.0", "main": "dist/index.js", "files": [ "dist" @@ -85,7 +85,7 @@ "@typescript-eslint/parser": "^5.37.0", "@walmart/allspark-authentication": "6.1.4", "@walmart/allspark-foundation": "6.27.4", - "@walmart/allspark-foundation-hub": "1.2.24", + "@walmart/allspark-foundation-hub": "1.3.0", "@walmart/allspark-graphql-client": "^1.4.6", "@walmart/allspark-http-client": "6.1.4", "@walmart/config-components": "4.4.0", --- yarn.lock @@ -5914,9 +5914,9 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-foundation-hub@npm:1.2.24": - version: 1.2.24 - resolution: "@walmart/allspark-foundation-hub@npm:1.2.24" +"@walmart/allspark-foundation-hub@npm:1.3.0": + version: 1.3.0 + resolution: "@walmart/allspark-foundation-hub@npm:1.3.0" dependencies: "@reduxjs/toolkit": "npm:^1.9.7" "@shopify/flash-list": "npm:~1.6.4" @@ -5932,7 +5932,7 @@ __metadata: react: "*" react-native: "*" react-native-safe-area-context: 4.x - checksum: 10c0/ffe4f457c909f82e23a8674562fe08c20c1a4f68b24350534ef2c0c62eb414fa0416dcc81e81b0ff287a6428508ad5e09e6c1acff1eb8cc537510813803c978a + checksum: 10c0/065f2d5758c4af6f1087eb539de5f43e8373058fe44008a2405f23d67c2e8c28cc97437e94266ba794895e395d4b365bb5f2627740f7aac867f0907f6ba72d00 languageName: node linkType: hard @@ -6383,7 +6383,7 @@ __metadata: "@typescript-eslint/parser": "npm:^5.37.0" "@walmart/allspark-authentication": "npm:6.1.4" "@walmart/allspark-foundation": "npm:6.27.4" - "@walmart/allspark-foundation-hub": "npm:1.2.24" + "@walmart/allspark-foundation-hub": "npm:1.3.0" "@walmart/allspark-graphql-client": "npm:^1.4.6" "@walmart/allspark-http-client": "npm:6.1.4" "@walmart/config-components": "npm:4.4.0"
Update the roster mini app version
Update the roster mini app version
a74109364604c1bd54223e391538f98d804cc1dd
--- package-lock.json @@ -108,7 +108,7 @@ "@walmart/time-clock-mini-app": "2.338.1", "@walmart/topstock-mini-app": "1.8.5", "@walmart/ui-components": "1.15.11", - "@walmart/welcomeme-mini-app": "0.89.0", + "@walmart/welcomeme-mini-app": "0.90.3", "@walmart/wfm-ui": "0.8.4", "@walmart/wm-plus-mini-app": "0.12.20", "@walmart/wmconnect-mini-app": "1.1.5", @@ -12641,9 +12641,9 @@ } }, "node_modules/@walmart/welcomeme-mini-app": { - "version": "0.89.0", - "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.89.0.tgz", - "integrity": "sha512-LCJD1J8qQ9QiPwp6P9f8kTuYc38KBzNNJRlrQvJhs8+yGtTVYOeiU5gBzuBAc9aDDmSPWx3ShPixHzh5s/F8vQ==", + "version": "0.90.3", + "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.90.3.tgz", + "integrity": "sha512-LBLB8muuKdfUP0CIUA4bQ1uk3CshMOPcJ/pAyUrWKeHA1cwFeIPdlVVypBswBfyCE9UxGYQ6tI2sSgAKDUxAig==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", --- package.json @@ -149,7 +149,7 @@ "@walmart/time-clock-mini-app": "2.338.1", "@walmart/topstock-mini-app": "1.8.5", "@walmart/ui-components": "1.15.11", - "@walmart/welcomeme-mini-app": "0.89.0", + "@walmart/welcomeme-mini-app": "0.90.3", "@walmart/wfm-ui": "0.8.4", "@walmart/wm-plus-mini-app": "0.12.20", "@walmart/wmconnect-mini-app": "1.1.5", @@ -410,7 +410,7 @@ "@walmart/time-clock-mini-app": "2.338.1", "@walmart/topstock-mini-app": "1.8.5", "@walmart/ui-components": "1.15.11", - "@walmart/welcomeme-mini-app": "0.89.0", + "@walmart/welcomeme-mini-app": "0.90.3", "@walmart/wfm-ui": "0.8.4", "@types/react": "^18.0.24", "@types/react-native": "0.72.6",
feat: bumping welcomeme package version for drop 21
feat: bumping welcomeme package version for drop 21
b9686bdcb53ecc575dab7016cc32baeb277c53f8
--- package.json @@ -76,7 +76,7 @@ "@types/react-test-renderer": "^18.0.7", "@walmart/allspark-authentication": "6.4.1", "@walmart/allspark-foundation": "^6.32.0", - "@walmart/allspark-foundation-hub": "1.10.0-beta.4778+f34e932b", + "@walmart/allspark-foundation-hub": "1.10.0-beta.4782+cf857485", "@walmart/allspark-utils": "6.5.1", "@walmart/config-components": "4.6.5", "@walmart/expo-config-plugins": "0.1.4", --- yarn.lock @@ -6950,9 +6950,9 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-foundation-hub@npm:1.10.0-beta.4778+f34e932b": - version: 1.10.0-beta.4778 - resolution: "@walmart/allspark-foundation-hub@npm:1.10.0-beta.4778::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fallspark-foundation-hub%2F-%2F%40walmart%2Fallspark-foundation-hub-1.10.0-beta.4778.tgz" +"@walmart/allspark-foundation-hub@npm:1.10.0-beta.4782+cf857485": + version: 1.10.0-beta.4782 + resolution: "@walmart/allspark-foundation-hub@npm:1.10.0-beta.4782::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fallspark-foundation-hub%2F-%2F%40walmart%2Fallspark-foundation-hub-1.10.0-beta.4782.tgz" peerDependencies: "@react-navigation/native": 6.x "@walmart/allspark-foundation": ">=6.27" @@ -6962,7 +6962,7 @@ __metadata: react: "*" react-native: "*" react-native-safe-area-context: 4.x - checksum: 10c0/f1f1a9124936932a4b5e508c3d0e5151a7dd7306663c6f03c4f6c22745825fd2a819bba63849777d8d15897e2a78c5b8eba28413fac986a78d298f9dfdeb1825 + checksum: 10c0/463642b542a791319af37a80bd74cee265a411fa6e541fb399df183d9320402b4738ae6232fc3ebd75d669e5b41dddc10efb002560ee3b50fb25b4309da375d9 languageName: node linkType: hard @@ -7294,7 +7294,7 @@ __metadata: "@types/react-test-renderer": "npm:^18.0.7" "@walmart/allspark-authentication": "npm:6.4.1" "@walmart/allspark-foundation": "npm:^6.32.0" - "@walmart/allspark-foundation-hub": "npm:1.10.0-beta.4778+f34e932b" + "@walmart/allspark-foundation-hub": "npm:1.10.0-beta.4782+cf857485" "@walmart/allspark-utils": "npm:6.5.1" "@walmart/config-components": "npm:4.6.5" "@walmart/expo-config-plugins": "npm:0.1.4"
feat(ui): update salaried roster widget
feat(ui): update salaried roster widget
4eb1fc8f8065b9cba7b8b15be1a0d014fb4d1451
--- package.json @@ -145,7 +145,7 @@ "@walmart/shelfavailability-mini-app": "1.5.23", "@walmart/store-feature-orders": "1.26.7", "@walmart/taskit-mini-app": "2.81.15", - "@walmart/time-clock-mini-app": "2.377.0", + "@walmart/time-clock-mini-app": "2.380.0", "@walmart/topstock-mini-app": "patch:@walmart/topstock-mini-app@npm%3A1.9.7#~/.yarn/patches/@walmart-topstock-mini-app-npm-1.9.7-e6400c510e.patch", "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.15.11#~/.yarn/patches/@walmart-ui-components-npm-1.15.11-19ccf914c5.patch", "@walmart/welcomeme-mini-app": "0.90.3", --- yarn.lock @@ -7146,9 +7146,9 @@ __metadata: languageName: node linkType: hard -"@walmart/time-clock-mini-app@npm:2.377.0": - version: 2.377.0 - resolution: "@walmart/time-clock-mini-app@npm:2.377.0" +"@walmart/time-clock-mini-app@npm:2.380.0": + version: 2.380.0 + resolution: "@walmart/time-clock-mini-app@npm:2.380.0" dependencies: "@react-navigation/elements": "npm:^1.3.1" moment-timezone: "npm:0.5.33" @@ -7191,7 +7191,7 @@ __metadata: uuid: ^3.3.2 wifi-store-locator: ^1.4.0 xdate: ^0.8.2 - checksum: 10c0/9f01e3cc0202456e4a8cbe689cc348c793d1cedb48d33acf3fa8f3ef67325754a8378bd76aafc037f49c30e5f48910a8c192f31852981a26852c860b1c35bb32 + checksum: 10c0/64aad3b53707c6c4a4628ff4d339cd43ebdf072b38640fcf7a6953d038f3ac67d64a4a6ed9c1d475d7d47b7489f7f800a61a4b391c02d1bb6cd68f7a3ba0d4a1 languageName: node linkType: hard @@ -7785,7 +7785,7 @@ __metadata: "@walmart/shelfavailability-mini-app": "npm:1.5.23" "@walmart/store-feature-orders": "npm:1.26.7" "@walmart/taskit-mini-app": "npm:2.81.15" - "@walmart/time-clock-mini-app": "npm:2.377.0" + "@walmart/time-clock-mini-app": "npm:2.380.0" "@walmart/topstock-mini-app": "patch:@walmart/topstock-mini-app@npm%3A1.9.7#~/.yarn/patches/@walmart-topstock-mini-app-npm-1.9.7-e6400c510e.patch" "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.15.11#~/.yarn/patches/@walmart-ui-components-npm-1.15.11-19ccf914c5.patch" "@walmart/welcomeme-mini-app": "npm:0.90.3"
Update TCMA to 2.380.0
Update TCMA to 2.380.0
a9f8721a5b41aa026e86ad7234b8d8bc573c33d2
--- graphql.yml @@ -39,8 +39,34 @@ applications: - 'v1' - name: 'GetAssociateName' queryTemplate: 'src/queries/getAssociateName.graphql' + tags: + - 'v3' + - name: 'GetDailyRoster' + queryTemplate: 'src/queries/getDailyRoster.graphql' + tags: + - 'v3' + - name: 'GetTeamById' + queryTemplate: 'src/queries/getTeamById.graphql' + tags: + - 'v3' + - name: 'GetTeamsByStore' + queryTemplate: 'src/queries/getTeamsbyStore.graphql' + tags: + - 'v3' + - name: 'upsertAssociateTextPreferences' + queryTemplate: 'src/queries/upsertAssociateTextPreference.graphql' + tags: + - 'v1' + - name: 'prod' + persistedQueries: + - name: 'GetAssociateClockStatus' + queryTemplate: 'src/queries/getAssociateClockStatus.graphql' tags: - 'v1' + - name: 'GetAssociateName' + queryTemplate: 'src/queries/getAssociateName.graphql' + tags: + - 'v3' - name: 'GetDailyRoster' queryTemplate: 'src/queries/getDailyRoster.graphql' tags: @@ -57,36 +83,3 @@ applications: queryTemplate: 'src/queries/upsertAssociateTextPreference.graphql' tags: - 'v1' - # - name: 'prod' - # persistedQueries: - # - name: 'GetAssociateClockStatus' - # hash: 'b4080db4f80721f28469fdce6584ae8afe567ee4c200d77b6889912ec1c0d214' - # queryTemplate: 'src/queries/getAssociateClockStatus.graphql' - # tags: - # - 'v1' - # - name: 'GetAssociateName' - # hash: 'f82efac63c0d36b80c7bc2a20ea4dfd6d8f970491fb373e8e0c61764dea2360f' - # queryTemplate: 'src/queries/getAssociateName.graphql' - # tags: - # - 'v1' - # - name: 'GetDailyRoster' - # hash: '3c6a1553234da438299662b03db04cc613b52ca997efb511ac76d5eff118a4bf' - # queryTemplate: 'src/queries/getDailyRoster.graphql' - # tags: - # - 'v2' - # - 'Drop13' - # - name: 'GetTeamById' - # hash: '5a1baf2e68d6b2c9ddec825296731ccd2137a9e7f12d1f7210ca797814bb3e3f' - # queryTemplate: 'src/queries/getTeamById.graphql' - # tags: - # - 'v1' - # - name: 'GetTeamsByStore' - # hash: '0d9bcce8cdce8831861e22bd66c43d0891aef2304b2bab61e449c5570aa564d2' - # queryTemplate: 'src/queries/getTeamsbyStore.graphql' - # tags: - # - 'v1' - # - name: 'upsertAssociateTextPreferences' - # hash: 'c32767303508d355e17b8489f8ecd28ec16a22ea3c454f9347ae96c9aefbec3b' - # queryTemplate: 'src/queries/upsertAssociateTextPreference.graphql' - # tags: - # - 'v1' --- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/roster-mini-app", - "version": "1.0.17.1", + "version": "1.0.17-alpha-1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/roster-mini-app", - "version": "1.0.17.1", + "version": "1.0.17-alpha-1", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.20.0", @@ -66,7 +66,7 @@ "@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.16.1", + "@walmart/wmconnect-mini-app": "1.0.16-alpha-1", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", @@ -11834,9 +11834,9 @@ } }, "node_modules/@walmart/wmconnect-mini-app": { - "version": "1.0.1-6.1", - "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.1-6.1.tgz", - "integrity": "sha512-p0HPkLTH2P3MnOkEesJQV0qB+BpEL7RfNp17pRsMf7c/exLLEqN1fxMLbSNDwtz5Xjiznv0tG4r+caS7HoM+yA==", + "version": "1.0.16-alpha-1", + "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.16-alpha-1.tgz", + "integrity": "sha512-xBdN0FWPA4hAghE7MrBe/vygaDRlgRZDRnGRn8P4pXh5jDSLv1ONKHUICZbOTfUptpmPyDlpgsudA98dHPD7TA==", "dev": true, "hasInstallScript": true }, @@ -41046,9 +41046,9 @@ } }, "@walmart/wmconnect-mini-app": { - "version": "1.0.1-6.1", - "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.1-6.1.tgz", - "integrity": "sha512-p0HPkLTH2P3MnOkEesJQV0qB+BpEL7RfNp17pRsMf7c/exLLEqN1fxMLbSNDwtz5Xjiznv0tG4r+caS7HoM+yA==", + "version": "1.0.16-alpha-1", + "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.16-alpha-1.tgz", + "integrity": "sha512-xBdN0FWPA4hAghE7MrBe/vygaDRlgRZDRnGRn8P4pXh5jDSLv1ONKHUICZbOTfUptpmPyDlpgsudA98dHPD7TA==", "dev": true }, "@whatwg-node/events": { --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "1.0.17.1", + "version": "1.0.17-alpha-1", "private": false, "main": "dist/index.js", "files": [ @@ -89,7 +89,7 @@ "@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.16.1", + "@walmart/wmconnect-mini-app": "1.0.16-alpha-1", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", --- sr.yaml @@ -30,3 +30,8 @@ applications: consumerIdInfos: - consumerId: 12f4fad8-2bba-439d-86bb-3aba6be9a807 publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiO/GyYc8U769GsAlKTDD1fjWqN6ME5sSrtHiAQQtKoMGZP7GYzbRsuoIsCNLc39a2+JN76q6cR0mWX8WyZsXYJKpnV6I/TqdH6QsvTLbfPxe4qCBtwYS98uhVfHCrOlqXa2CoeuQwNDx42YZ3uDSD3CYMH2pxbKRN/dXXmwWYqO/8zf9DhMCPaqPrsSI+1etNDYDSKN48mCo6jJq0CzYdseTHzhkeDDyRj9nzNpZbDq8jotp7f11n0GpQzwH/TTRIfw8WieNTok4vIvSIf5BOj/TUCtjry/Ide2BcEd3wRDneOW3mHbCZff+sHkHAtqAfzGppYcJ6FgKxzVgaytWcwIDAQAB + - name: prod + type: PRODUCTION + consumerIdInfos: + - consumerId: 7d935f1c-b438-4b89-9324-83a5380acf75 + publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiO/GyYc8U769GsAlKTDD1fjWqN6ME5sSrtHiAQQtKoMGZP7GYzbRsuoIsCNLc39a2+JN76q6cR0mWX8WyZsXYJKpnV6I/TqdH6QsvTLbfPxe4qCBtwYS98uhVfHCrOlqXa2CoeuQwNDx42YZ3uDSD3CYMH2pxbKRN/dXXmwWYqO/8zf9DhMCPaqPrsSI+1etNDYDSKN48mCo6jJq0CzYdseTHzhkeDDyRj9nzNpZbDq8jotp7f11n0GpQzwH/TTRIfw8WieNTok4vIvSIf5BOj/TUCtjry/Ide2BcEd3wRDneOW3mHbCZff+sHkHAtqAfzGppYcJ6FgKxzVgaytWcwIDAQAB
Update version
Update version
f6314b767eed3aca0092c8a0e094a15c288a4416
--- package-lock.json @@ -58,7 +58,7 @@ "@walmart/gta-react-native-calendars": "0.1.0", "@walmart/gtp-shared-components": "2.1.3", "@walmart/impersonation-mini-app": "1.20.6", - "@walmart/ims-print-services-ui": "2.7.4", + "@walmart/ims-print-services-ui": "2.7.3", "@walmart/inbox-mini-app": "0.88.9", "@walmart/iteminfo-mini-app": "7.6.3", "@walmart/manager-approvals-miniapp": "0.2.4", @@ -8958,9 +8958,9 @@ } }, "node_modules/@walmart/ims-print-services-ui": { - "version": "2.7.4", - "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.7.4.tgz", - "integrity": "sha512-OygtObnpPMgwPpn37CFEYfaIoGkL6oCcr20Ye2g6CuJPICG/OeF+F+KjJApPnwr8JwmoyP8EhrbWrGE502aU3w==", + "version": "2.7.3", + "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.7.3.tgz", + "integrity": "sha512-wZIf4S2Vh4IHOXocsDZFeGJbPSyhyN2SpdbTzRjFNsWj94us4TnOXAM04oy/nrX3lUcrKR2CN3WupwhfqZ42PQ==", "peerDependencies": { "@react-native-firebase/analytics": ">=10.5.1", "@react-native-firebase/app": ">=10.5.0", @@ -33323,9 +33323,9 @@ "integrity": "sha512-5qaxHHlwLNsI2QOghCAlp1FS3sE0bdJ9DOswgEClQgRdZwFTZTY1F1qWkLmWVdnZm3/k7BTE3RT/Ltfy0rbfxg==" }, "@walmart/ims-print-services-ui": { - "version": "2.7.4", - "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.7.4.tgz", - "integrity": "sha512-OygtObnpPMgwPpn37CFEYfaIoGkL6oCcr20Ye2g6CuJPICG/OeF+F+KjJApPnwr8JwmoyP8EhrbWrGE502aU3w==" + "version": "2.7.3", + "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.7.3.tgz", + "integrity": "sha512-wZIf4S2Vh4IHOXocsDZFeGJbPSyhyN2SpdbTzRjFNsWj94us4TnOXAM04oy/nrX3lUcrKR2CN3WupwhfqZ42PQ==" }, "@walmart/inbox-mini-app": { "version": "0.88.9", --- package.json @@ -99,7 +99,7 @@ "@walmart/gta-react-native-calendars": "0.1.0", "@walmart/gtp-shared-components": "2.1.3", "@walmart/impersonation-mini-app": "1.20.6", - "@walmart/ims-print-services-ui": "2.7.4", + "@walmart/ims-print-services-ui": "2.7.3", "@walmart/inbox-mini-app": "0.88.9", "@walmart/iteminfo-mini-app": "7.6.3", "@walmart/manager-approvals-miniapp": "0.2.4",
Downgrade print UI to 2.7.3 due to P1 bug
Downgrade print UI to 2.7.3 due to P1 bug
a33ea6bb97569be55ab19046e70a173120884780
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart", - "version": "1.35.1", + "version": "1.35.0", "main": "index.js", "private": true, "workspaces": [
chore: temporarily bumping down the version
chore: temporarily bumping down the version
353fd96eeb420128558e5de4ffd869392cdf327e
--- .looper-pr.yml @@ -12,11 +12,6 @@ flows: - (name Yarn Version) yarn --version - (name Yarn Install) yarn install - commit-convention-checker: - - echo 'conventional commit disabled' - semantic-dry-run: - - echo 'semantic dryrun disabled' - envs: global: variables:
feat(ui): update looper #SMDV-7738
feat(ui): update looper #SMDV-7738
be549a2362f2b10ca3d9e00e3239227d3ddce877
--- lerna.json @@ -5,7 +5,7 @@ "command": { "publish": { "conventionalCommits": true, - "conventionalPrerelease": true, + "conventionalPrerelease": false, "message": "chore(publish): publish package", "registry": "https://npme.walmart.com" }, @@ -13,7 +13,7 @@ "message": "chore(version): updating package version", "allowBranch": ["main", "develop"], "conventionalCommits": true, - "conventionalPrerelease": true + "conventionalPrerelease": false } }, "ignoreChanges": ["**/*.md", "**/__tests__/**"],
chore: disabling lerna prerelease
chore: disabling lerna prerelease
09e50b041bd01c64ef0d9927b3f4ce2600797424
--- __tests__/whatsNew/WhatsNewItemTest.tsx @@ -15,6 +15,7 @@ const logger = LoggerService.getContainerInstance(); const baseProps = { image: 'https://i5-me.walmartimages.com', + placeholder: 'KEHpGG0,035Ex@~S02?E~Q', title: 'My Team', text: 'This is what we added for my team!', }; --- __tests__/whatsNew/__snapshots__/WhatsNewItemTest.tsx.snap @@ -12,11 +12,7 @@ exports[`WhatsNewItem handles navigation link 1`] = ` <Image contentFit="cover" onError={[Function]} - placeholder={ - { - "testUri": "../../../src/images/assets/ask-sam-illustration.png", - } - } + placeholder="KEHpGG0,035Ex@~S02?E~Q" source={ { "uri": "https://i5-me.walmartimages.com", @@ -91,11 +87,7 @@ exports[`WhatsNewItem handles navigation link without screen 1`] = ` <Image contentFit="cover" onError={[Function]} - placeholder={ - { - "testUri": "../../../src/images/assets/ask-sam-illustration.png", - } - } + placeholder="KEHpGG0,035Ex@~S02?E~Q" source={ { "uri": "https://i5-me.walmartimages.com", @@ -170,11 +162,7 @@ exports[`WhatsNewItem matches snapshot 1`] = ` <Image contentFit="cover" onError={[Function]} - placeholder={ - { - "testUri": "../../../src/images/assets/ask-sam-illustration.png", - } - } + placeholder="KEHpGG0,035Ex@~S02?E~Q" source={ { "uri": "https://i5-me.walmartimages.com", --- src/whatsNew/WhatsNewItem.tsx @@ -11,7 +11,7 @@ import {WhatsNewConfig} from './types'; import {WhatsNewItemStyles as styles} from './styles'; export const WhatsNewItem = (props: WhatsNewConfig) => { - const {title, text, image, link} = props; + const {title, text, image, link, placeholder} = props; const navigation = useNavigation<MainStackNavigationProp>(); const onLinkPress = () => { @@ -31,7 +31,7 @@ export const WhatsNewItem = (props: WhatsNewConfig) => { source={{ uri: image, }} - placeholder={Images.AskSamIllustration as any} + placeholder={placeholder || (Images.AskSamIllustration as any)} onError={({error}) => { Logger.error('Error loading i5 image', { message: image, --- src/whatsNew/types.ts @@ -24,6 +24,7 @@ export interface FeatureRestriction { export interface WhatsNewConfig { image: string; + placeholder: string; title: RecordText; text: RecordText; link?: RecordLink;
update whatsnew placeholder
update whatsnew placeholder
9f3a8ae027d64c614f5c80848f96aab539437048
--- packages/allspark-foundation/src/HTTP/HttpClientFactory.tsx @@ -124,6 +124,14 @@ export class HttpClientFactory { this.forEach((client) => client.addInterceptor(interceptor)); }; + /** + * Configures all feature clients with the provided settings. + * @param config Configuration settings to apply to all feature clients. + */ + public configure = (config: HttpClientConfig) => { + this.forEach((client) => client.configure(config)); + }; + /** * @deprecated Use `createFeatureClient` instead. */ --- packages/allspark-foundation/src/HTTP/HttpModule.ts @@ -55,11 +55,14 @@ export class HttpModule { } /** - * Reinitialize the base client and factory with new options. + * Configure the base HTTP client and all existing feature clients with the provided settings. */ static configure = (config?: HttpClientConfig) => { if (config) { + // Configure the base client. This will extend to all clients created after this point this.instance._client.configure(config); + // Configure the factory. This will apply to all existing feature clients + this.instance._factory.configure(config); } }; }
fix(http): interceptors added at the module level by the container were not applied to feature clients created early
fix(http): interceptors added at the module level by the container were not applied to feature clients created early
875bf5b96f3ca02e53137bf0bb8f9de31ab28243
--- packages/allspark-foundation/src/Redux/reducer.ts @@ -1,35 +1,4 @@ -import { - EnvironmentState, - IEnvironmentAction, - environmentSlice, -} from '../Environment/redux'; -import { - ContainerState, - IContainerAction, - containerSlice, -} from '../Container/redux'; -import { ConfigState, IConfigAction, configSlice } from '../Config/redux'; -import { ClockState, IClockAction, clockSlice } from '../Clock/redux'; -import { DeviceState, IDeviceAction, deviceSlice } from '../Device/redux'; -import { NetworkState, INetworkAction, networkSlice } from '../Network/redux'; -import { - NotificationState, - INotificationAction, - notificationSlice, -} from '../Notification/redux'; -import { - PermissionsState, - IPermissionAction, - permissionsSlice, -} from '../Permissions/redux'; -import { SiteState, ISiteAction, siteSlice } from '../Site/redux'; -import { UserState, IUserAction, userSlice } from '../User/redux'; import { WorkState, IWorkAction, workSlice } from '../Work/redux'; -import { - NavConfigState, - INavConfigAction, - navConfigSlice, -} from '../Navigation/config/redux'; /** * The root reducer for the Allspark framework. @@ -37,17 +6,6 @@ import { * @todo - with module pattern implementation, reducers will be added dynamically by modules. */ export const AllsparkRootReducer = { - [clockSlice.name]: clockSlice.reducer, - [configSlice.name]: configSlice.reducer, - [containerSlice.name]: containerSlice.reducer, - [deviceSlice.name]: deviceSlice.reducer, - [environmentSlice.name]: environmentSlice.reducer, - [navConfigSlice.name]: navConfigSlice.reducer, - [networkSlice.name]: networkSlice.reducer, - [notificationSlice.name]: notificationSlice.reducer, - [permissionsSlice.name]: permissionsSlice.reducer, - [siteSlice.name]: siteSlice.reducer, - [userSlice.name]: userSlice.reducer, [workSlice.name]: workSlice.reducer, }; @@ -57,32 +15,10 @@ export const AllsparkRootReducer = { declare global { namespace Allspark { interface ReduxState { - [clockSlice.name]: ClockState; - [configSlice.name]: ConfigState; - [containerSlice.name]: ContainerState; - [deviceSlice.name]: DeviceState; - [environmentSlice.name]: EnvironmentState; - [navConfigSlice.name]: NavConfigState; - [networkSlice.name]: NetworkState; - [notificationSlice.name]: NotificationState; - [permissionsSlice.name]: PermissionsState; - [siteSlice.name]: SiteState; - [userSlice.name]: UserState; [workSlice.name]: WorkState; } interface ReduxActions { - [clockSlice.name]: IClockAction; - [configSlice.name]: IConfigAction; - [containerSlice.name]: IContainerAction; - [deviceSlice.name]: IDeviceAction; - [environmentSlice.name]: IEnvironmentAction; - [navConfigSlice.name]: INavConfigAction; - [networkSlice.name]: INetworkAction; - [notificationSlice.name]: INotificationAction; - [permissionsSlice.name]: IPermissionAction; - [siteSlice.name]: ISiteAction; - [userSlice.name]: IUserAction; [workSlice.name]: IWorkAction; } }
fix(redux): remove reducers migrated to module pattern from root reducer
fix(redux): remove reducers migrated to module pattern from root reducer
ef3318c3c3d463de7041b098d1650cef8fac58f6
--- src/managerExperience/components/FilterChip/styles.ts @@ -2,21 +2,24 @@ import {StyleSheet, ViewStyle} from 'react-native'; import {colors} from '@walmart/gtp-shared-components'; const chipContainerShared: ViewStyle = { - borderWidth: 0, + borderWidth: 2, borderRadius: 1000, justifyContent: 'center', alignSelf: 'center', minWidth: 10, + padding: 14, }; export const filterChipStyles = StyleSheet.create({ chipContainerActive: { ...chipContainerShared, backgroundColor: colors.gray['160'], + borderColor: colors.gray['160'], }, chipContainerInactive: { ...chipContainerShared, backgroundColor: colors.gray['10'], + borderColor: colors.gray['10'], }, chipTextActive: { color: colors.white,
fix: fixed border enlarge issue
fix: fixed border enlarge issue
077642417e5fdae844b48627a2a0dc5c2d3c5d4d
--- package.json @@ -95,7 +95,7 @@ "@walmart/functional-components": "2.0.6", "@walmart/gta-react-native-calendars": "0.0.15", "@walmart/gtp-shared-components": "^2.0.0", - "@walmart/impersonation-mini-app": "1.9.0", + "@walmart/impersonation-mini-app": "1.10.0", "@walmart/ims-print-services-ui": "1.2.0", "@walmart/inbox-mini-app": "0.78.0", "@walmart/iteminfo-mini-app": "5.3.2",
Bupmed @walmart/impersonation-mini-app to 1.10.0
Bupmed @walmart/impersonation-mini-app to 1.10.0 Bupmed @walmart/impersonation-mini-app to 1.10.0
78798802d2bc0b3140fbaeca2dd7b6f4bc4582c3
--- package-lock.json @@ -3406,9 +3406,9 @@ } }, "@walmart/manager-approvals-miniapp": { - "version": "0.0.49", - "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.0.49.tgz", - "integrity": "sha512-gIYsNFhVWVo9VUTC+SePfXI5y8ERj0Z/mR7Q26qn7yHCcCvn9nCU6a1b8HHx6jzBwsGOPSum2gFG9pYMc+478g==" + "version": "0.0.51", + "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.0.51.tgz", + "integrity": "sha512-f4KuVr2K+ITDD3vmd1FWWAdHYKUyd+/PGu3s0YpFCAMe97jEm9En9xcDT1iEqM+3+kpcunwzm/E09vexdz8VMQ==" }, "@walmart/metrics-mini-app": { "version": "0.4.11", --- package.json @@ -85,7 +85,7 @@ "@walmart/ims-print-services-ui": "0.0.36", "@walmart/inbox-mini-app": "0.8.0", "@walmart/iteminfo-mini-app": "2.0.9", - "@walmart/manager-approvals-miniapp": "0.0.49", + "@walmart/manager-approvals-miniapp": "0.0.51", "@walmart/metrics-mini-app": "0.4.11", "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.5.34",
version bump
version bump
1048c27a3ddbeb5d3096adbb6fdcfeac9b0e2b4b
--- package.json @@ -45,7 +45,7 @@ "@walmart/allspark-home-mini-app": "0.1.4", "@walmart/allspark-me-mini-app": "0.0.11", "@walmart/ask-sam-mini-app": "0.6.25", - "@walmart/config-components": "1.0.7", + "@walmart/config-components": "1.0.8", "@walmart/feedback-all-spark-miniapp": "0.0.29", "@walmart/functional-components": "^1.0.22", "@walmart/gtp-shared-components": "^0.2.2", @@ -56,7 +56,7 @@ "@walmart/react-native-shared-navigation": "^0.2.0", "@walmart/redux-store": "^1.0.7", "@walmart/schedule-mini-app": "0.2.24", - "@walmart/settings-mini-app": "1.1.5", + "@walmart/settings-mini-app": "1.1.7", "@walmart/time-clock-mini-app": "0.0.21", "@walmart/ui-components": "^1.0.77", "i18next": "^19.7.0", @@ -108,7 +108,7 @@ "seamless-immutable": "^7.1.4", "semver": "^7.3.4", "victory-native": "^35.0.1", - "@walmart/inbox-mini-app": "0.0.14", + "@walmart/inbox-mini-app": "0.0.18", "javascript-time-ago": "^2.3.3" }, "devDependencies": {
ssmp version bump (#175)
ssmp version bump (#175) * ssmp version bump Setting and inbox * version bump
390b4b0e75b6ccad2a94b97f7d86bbd8de4f7241
--- packages/allspark-foundation-hub/src/HubFeature/Shared/Components/SearchInput/SearchInput.tsx @@ -6,26 +6,27 @@ import { TeamSearchInputLoading } from './TeamSearchInputLoading'; import { TeamSearchInputProps } from './types'; export const TeamSearchInput = ({ - leftIcon, - rightIcon, + LeftIcon, + RightIcon, loading, handleChange, }: TeamSearchInputProps) => { if (loading) { - return <TeamSearchInputLoading rightIcon={rightIcon} />; + return <TeamSearchInputLoading loading={loading} />; } - + const leftIconComponent = LeftIcon ? ( + <LeftIcon size={'small'} /> + ) : ( + <Icons.SearchIcon size={'small'} /> + ); + const rightIconComponent = RightIcon ? ( + <RightIcon size={'medium'} /> + ) : ( + <Icons.MicrophoneIcon size={'medium'} /> + ); return ( <View style={styles.container}> - <View style={styles.iconLeftWrapper}> - {leftIcon && ( - <Icons.SearchIcon - color={colors.gray['100']} - size={'medium'} - testID='search-icon' - /> - )} - </View> + <View style={styles.iconLeftWrapper}>{leftIconComponent}</View> <TextInput style={styles.inputStyle} placeholder='Search for a team' @@ -33,11 +34,9 @@ export const TeamSearchInput = ({ onChangeText={handleChange} testID='search-input' /> - {rightIcon && ( - <View style={styles.iconRight} testID='microphone-icon'> - <Icons.MicrophoneIcon size={'medium'} /> - </View> - )} + <View style={styles.iconRight} testID='microphone-icon'> + {rightIconComponent} + </View> </View> ); }; --- packages/allspark-foundation-hub/src/HubFeature/Shared/Components/SearchInput/TeamSearchInputLoading.tsx @@ -5,9 +5,13 @@ import { useWindowDimensions, View } from 'react-native'; import { TeamSearchInputLoadingProps } from './types'; export const TeamSearchInputLoading = ({ - rightIcon, + loading, }: TeamSearchInputLoadingProps) => { const { width } = useWindowDimensions(); + + if (!loading) { + return null; + } return ( <View style={styles.loadingContainer} @@ -17,15 +21,11 @@ export const TeamSearchInputLoading = ({ <Skeleton height={width * 0.04} width={width * 0.04} /> <Skeleton height={20} width={width * 0.33} /> </View> - {rightIcon ? ( - <Skeleton - height={width * 0.07} - width={width * 0.07} - testID='loading-microphone-icon' - /> - ) : ( - <View /> - )} + <Skeleton + height={width * 0.07} + width={width * 0.07} + testID='loading-microphone-icon' + /> </View> ); }; --- packages/allspark-foundation-hub/src/HubFeature/Shared/Components/SearchInput/style.ts @@ -30,14 +30,15 @@ export const TeamSearchInputStyles = StyleSheet.create({ color: colors.gray['100'], }, loadingContainer: { - width: '100%', display: 'flex', flexDirection: 'row', alignItems: 'center', - padding: 17, + padding: 12, justifyContent: 'space-between', - borderTopWidth: 1, - borderBottomWidth: 1, + marginRight: 16, + marginLeft: 16, + borderWidth: 1, + borderRadius: 30, borderColor: colors.separator['100'], }, loadingLeftElements: { --- packages/allspark-foundation-hub/src/HubFeature/Shared/Components/SearchInput/types.ts @@ -1,10 +1,18 @@ export interface TeamSearchInputProps { - leftIcon?: boolean; - rightIcon?: boolean; + LeftIcon?: React.ComponentType<{ + size: string; + color?: string; + testID?: string; + }>; + RightIcon?: React.ComponentType<{ + size: string; + color?: string; + testID?: string; + }>; loading?: boolean; handleChange: (text: string) => void; } export interface TeamSearchInputLoadingProps { - rightIcon: boolean | undefined; + loading: boolean | undefined; }
Adding icon conditional rendering logic
Adding icon conditional rendering logic
6ecbbe6c96f5a1e8d9944366ebd9cfb456081403
--- package-lock.json @@ -4208,9 +4208,9 @@ "integrity": "sha512-7OL7IwfRrGvMB+o6z7pULrc+p+uPmitHutcrN68NZVROrRCvM9BXw01gxaTxCJ19vGWhg2jSP7j8JOaQzWUF3g==" }, "@walmart/feedback-all-spark-miniapp": { - "version": "0.1.18", - "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.1.18.tgz", - "integrity": "sha512-2tdAveh1wefH5/6g9iefk/19NbNSLf8EuV3KGovCa/obypLE9Rfa6VPpPNgqvgsD2U05w2uxs5ix6xut9fFmgQ==" + "version": "0.1.21", + "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.1.21.tgz", + "integrity": "sha512-GYS5aQAN+a1SSzXFRcNFAAvmnWk0FNg/WsUPDiw8bGIJXlJ0qIoef3LgSfrylmGlvwb51GMOOhe9AggOm2CntQ==" }, "@walmart/functional-components": { "version": "1.0.34", @@ -4475,8 +4475,8 @@ } }, "@walmart/taskit-mini-app": { - "version": "0.164.0-rc.1", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.164.0-rc.1.tgz", + "version": "0.167.0-rc.1", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.167.0-rc.1.tgz", "integrity": "sha512-OYpzZHJaDdNpphiqq1KQmNdnYzkoi/RcDzXBeiZZ9lCNkpRvIDRemdK80Gof0U2u7/IcGivPYYX7k23DvK/wOw==" }, "@walmart/time-clock-mini-app": { --- package.json @@ -78,7 +78,7 @@ "@walmart/config-components": "1.0.35", "@walmart/counts-component-miniapp": "0.0.32", "@walmart/exception-mini-app": "0.39.2", - "@walmart/feedback-all-spark-miniapp": "0.1.18", + "@walmart/feedback-all-spark-miniapp": "0.1.21", "@walmart/functional-components": "1.0.34", "@walmart/gta-react-native-calendars": "0.0.15", "@walmart/gtp-shared-components": "1.2.0",
Bump up feedback miniapp version
Bump up feedback miniapp version
d2a2474c68ebeef435ae427a66f3c08c6d77bd5e
--- packages/allspark-foundation/__tests__/Navigation/provider.test.tsx @@ -20,10 +20,9 @@ jest.mock('react-native-modalfy', () => ({ })); describe('AllsparkNavigationProvider', () => { it('should resolve config and render children correctly', async () => { - const mockConfig = { key: 'value' }; // Mock config - const resolvedConfig = { resolvedKey: 'resolvedValue' }; // Resolved config + const mockConfig = { key: 'value' }; + const resolvedConfig = { resolvedKey: 'resolvedValue' }; - // Mock resolveDerivedValue to return the resolved config (AllsparkEnvironment.resolveDerivedValue as jest.Mock).mockResolvedValue( resolvedConfig ); @@ -34,7 +33,6 @@ describe('AllsparkNavigationProvider', () => { </AllsparkNavigationProvider> ); - // Ensure preRender function is called and config is resolved await waitFor(() => { expect(AllsparkEnvironment.resolveDerivedValue).toHaveBeenCalledWith( mockConfig @@ -44,7 +42,6 @@ describe('AllsparkNavigationProvider', () => { ); }); - // Ensure children are rendered after configuration await waitFor(() => { expect(getByText('Child Component')).toBeTruthy(); }); @@ -57,7 +54,6 @@ describe('AllsparkNavigationProvider', () => { </AllsparkNavigationProvider> ); - // Ensure children are rendered without config await waitFor(() => { expect(getByText('Child Component')).toBeTruthy(); });
code cleanup
code cleanup
06d2d4dc41119ae50ef42e6f1983777b43fa0f14
--- packages/allspark-foundation-hub/__tests__/FeatureRunner/components/__snapshots__/FeatureSection.test.tsx.snap @@ -2,9 +2,30 @@ exports[`FeatureSection should render snapshot 1`] = ` <View> - <Heading> - Feature: - </Heading> + <View + style={ + [ + { + "flexDirection": "row", + "justifyContent": "space-between", + }, + undefined, + ] + } + > + <Heading> + Feature: + ( + Enabled + ) + </Heading> + <Button + onPress={[Function]} + variant="tertiary" + > + Disable + </Button> + </View> <Card UNSAFE_style={ [ --- packages/allspark-foundation-hub/__tests__/FeatureRunner/screens/__snapshots__/Home.test.tsx.snap @@ -132,9 +132,30 @@ exports[`Home should render correctly 1`] = ` } } > - <Heading> - Feature: - </Heading> + <View + style={ + [ + { + "flexDirection": "row", + "justifyContent": "space-between", + }, + undefined, + ] + } + > + <Heading> + Feature: + ( + Enabled + ) + </Heading> + <Button + onPress={[Function]} + variant="tertiary" + > + Disable + </Button> + </View> <Card UNSAFE_style={ [ --- packages/allspark-foundation-hub/__tests__/FeatureRunner/screens/__snapshots__/SideMenu.test.tsx.snap @@ -868,6 +868,168 @@ exports[`SideMenu.tsx should render snapshot 1`] = ` testID="Divider" /> </View> + <View + style={ + { + "marginHorizontal": 8, + } + } + > + <View + 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={ + { + "opacity": 1, + } + } + > + <View + style={ + [ + { + "backgroundColor": "#fff", + "flexDirection": "row", + "paddingHorizontal": 0, + "paddingVertical": 16, + }, + { + "paddingLeft": 8, + }, + ] + } + testID="ListItem" + > + <View + style={ + { + "flex": 1, + } + } + > + <Text + accessibilityRole="text" + style={ + [ + { + "color": "#2e2f32", + "fontFamily": "Bogle", + "fontSize": 18, + "fontStyle": "normal", + "fontWeight": "700", + "lineHeight": 24, + }, + {}, + ] + } + testID="ListItem-title" + > + Clock + </Text> + <Text + accessibilityRole="text" + style={ + [ + { + "color": "#2e2f32", + "fontFamily": "Bogle", + "fontSize": 16, + "fontStyle": "normal", + "fontWeight": "400", + "lineHeight": 24, + }, + {}, + ] + } + testID="ListItem-content" + > + Simulate clock events + </Text> + </View> + <View + style={ + { + "alignItems": "flex-end", + "justifyContent": "center", + "marginLeft": 16, + } + } + testID="ListItem-trailing" + > + <IconButton + UNSAFE_style={ + { + "maxWidth": 100, + } + } + onPress={[Function]} + size="large" + testID="ListItem-trailing-content" + > + <Image + accessibilityRole="image" + source={ + { + "testUri": "../../@walmart/gtp-shared-icons/assets/images/icons/ArrowRight-16.png", + } + } + style={ + [ + { + "height": 16, + "tintColor": "black", + "width": 16, + }, + {}, + ] + } + testID="ArrowRightIcon" + /> + </IconButton> + </View> + </View> + </View> + <View + accessibilityRole="none" + style={ + [ + { + "borderBottomColor": "#e3e4e5", + "borderBottomWidth": 1, + "flex": 1, + "height": 1, + }, + undefined, + ] + } + testID="Divider" + /> + </View> <View style={ {
feat(ui): updated snapshots
feat(ui): updated snapshots
185ea3873c744b0a065820583635d9323ccc73f7
--- src/navigation/components.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, {ReactNode} from 'react'; import {StyleSheet, View} from 'react-native'; import {MaterialTopTabBarProps} from '@react-navigation/material-top-tabs'; import {TabNavigationItem} from '@walmart/gtp-shared-components'; @@ -48,8 +48,8 @@ export const LivingDesignTabBar = (props: MaterialTopTabBarProps) => { }; return ( - //@ts-ignore <TabNavigationItem + index={index} isCurrent={isFocused} onPress={onPress} tabCount={state.routes.length} @@ -59,7 +59,8 @@ export const LivingDesignTabBar = (props: MaterialTopTabBarProps) => { color: tintColor || '', })} trailing={options.tabBarBadge?.()}> - {label} + {/** Doing it like to unblock it for now, opening a ticket with GTP */} + {label as ReactNode} </TabNavigationItem> ); }); --- src/navigation/components.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, {ReactNode} from 'react'; import {StyleSheet, View} from 'react-native'; import {MaterialTopTabBarProps} from '@react-navigation/material-top-tabs'; import {TabNavigationItem} from '@walmart/gtp-shared-components'; @@ -48,8 +48,8 @@ export const LivingDesignTabBar = (props: MaterialTopTabBarProps) => { }; return ( - //@ts-ignore <TabNavigationItem + index={index} isCurrent={isFocused} onPress={onPress} tabCount={state.routes.length} @@ -59,7 +59,8 @@ export const LivingDesignTabBar = (props: MaterialTopTabBarProps) => { color: tintColor || '', })} trailing={options.tabBarBadge?.()}> - {label} + {/** Doing it like to unblock it for now, opening a ticket with GTP */} + {label as ReactNode} </TabNavigationItem> ); });
unblocking tsc
unblocking tsc
8ea3667847190da17caaa862e2f6de0e131456b3
--- package-lock.json @@ -4287,9 +4287,9 @@ "integrity": "sha512-7IEyBIuL87sBJj2YD1suMfIM0g/ifdZZ1B6IVWxOAkWRhTZXyrskZf9kySQ4/nAI8mspHkXXVmEsboRAJSZ8OA==" }, "@walmart/iteminfo-mini-app": { - "version": "4.1.6", - "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-4.1.6.tgz", - "integrity": "sha512-JMgD+h5uCI9aas6LtMsgWUKVLwsqdTLa7JxVn8Z9xycZUzgprC2kGYIWE3W2MdgjCufl3fCvNpN8wm9QQ+wmJQ==" + "version": "4.1.7", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-4.1.7.tgz", + "integrity": "sha512-T2sPsFo7+JzMx9PcIzIRrU9xdWfNwxqAJ4BaIwXka+nGQEg2VN7pQLKMtOio1RLUUbYobZgHWo+nBQWp5uYgYw==" }, "@walmart/manager-approvals-miniapp": { "version": "0.0.59", --- package.json @@ -85,7 +85,7 @@ "@walmart/impersonation-mini-app": "1.0.27", "@walmart/ims-print-services-ui": "0.1.28", "@walmart/inbox-mini-app": "0.37.0", - "@walmart/iteminfo-mini-app": "4.1.6", + "@walmart/iteminfo-mini-app": "4.1.7", "@walmart/manager-approvals-miniapp": "0.0.59", "@walmart/metrics-mini-app": "0.7.65", "@walmart/moment-walmart": "1.0.4",
item info additional log to identify items with no sf locations
item info additional log to identify items with no sf locations
14d7fb0b4da5c0505618d0f313eaaa0e2823f4cd
--- src/impersonation/ImpersonationScreen.tsx @@ -4,7 +4,6 @@ import {useDispatch, useSelector} from 'react-redux'; import {Switch} from '@walmart/gtp-shared-components'; import { - UserSelectors, ImpersonationForm, User, ImpersonationUser, @@ -39,7 +38,6 @@ export const ImpersonationScreen = ( const dispatch = useDispatch(); const {t} = useAllsparkTranslation(); - const impersonated = useSelector(UserSelectors.getImpersonated); const isGeoValidationDisabled = useSelector( ClockAppSelectors.getGeoValidationDisabled, ); @@ -117,7 +115,6 @@ export const ImpersonationScreen = ( <View style={styles.customFormFields}> <Switch label={t('impersonation.allowGeoClk')} - disabled={impersonated} accessibilityLabel='allow geo clock' testID='Switch-GeoClk' isOn={!isGeoValidationDisabled}
fix: impersonation geo validation toggle disabled when impersonated
fix: impersonation geo validation toggle disabled when impersonated
d1f1a2e50edadcc5a540b5ffaff77bfae2eb57b5
--- targets/US/package.json @@ -101,7 +101,7 @@ "@walmart/core-widget-registry": "workspace:^", "@walmart/counts-component-miniapp": "0.1.11", "@walmart/emergency-mini-app": "1.27.7", - "@walmart/exception-mini-app": "1.8.4", + "@walmart/exception-mini-app": "1.8.11", "@walmart/facilities-management-miniapp": "0.12.11", "@walmart/feedback-all-spark-miniapp": "0.9.66", "@walmart/financial-wellbeing-feature-app": "1.26.0", --- yarn.lock @@ -6348,15 +6348,16 @@ __metadata: languageName: node linkType: hard -"@walmart/exception-mini-app@npm:1.8.4": - version: 1.8.4 - resolution: "@walmart/exception-mini-app@npm:1.8.4" +"@walmart/exception-mini-app@npm:1.8.11": + version: 1.8.11 + resolution: "@walmart/exception-mini-app@npm:1.8.11" peerDependencies: - "@walmart/core-services": ^2.0.15 - "@walmart/core-services-allspark": ^2.10.3 + "@walmart/allspark-foundation": "*" + "@walmart/core-services": ">=6.3.6" + "@walmart/core-services-allspark": ">=6.4.0" "@walmart/functional-components": ">=2.0.6" "@walmart/gtp-shared-components": ">=2.1.3" - "@walmart/ims-print-services-ui": 2.0.6 + "@walmart/ims-print-services-ui": ">=2.11.3" "@walmart/react-native-logger": ">=1.31.0-rc.0" "@walmart/redux-store": ">=3.4.0" "@walmart/ui-components": ">=1.6.0" @@ -6364,11 +6365,11 @@ __metadata: react-i18next: ">=12.0.0" react-native: ">=0.72.0" react-native-device-info: ">=10.3.0" - react-native-new-snap-carousel: ^3.9.3 + react-native-new-snap-carousel: ">=3.9.3" react-native-ssmp-sso-allspark: ">=1.1.0" react-native-webview: ">=11.23.1" uuid: ">=3.3.2" - checksum: 10c0/1e8bee3761941f20020572f2eaa2958e535baade92d4abab117e19f49d5520320031c03e0028f0a3657e594bb96116a03e9f05a2c2a6aa2ccde92dc587cdf884 + checksum: 10c0/fa1c23b39aa89502727834e56085abcdad371e5c5acda910ffcc77ae3b2295060e05d6e2d02062b11ebd5fb3817a434fbcbb93b78a093a17a26fa57613922647 languageName: node linkType: hard @@ -7029,7 +7030,7 @@ __metadata: "@walmart/core-widget-registry": "workspace:^" "@walmart/counts-component-miniapp": "npm:0.1.11" "@walmart/emergency-mini-app": "npm:1.27.7" - "@walmart/exception-mini-app": "npm:1.8.4" + "@walmart/exception-mini-app": "npm:1.8.11" "@walmart/facilities-management-miniapp": "npm:0.12.11" "@walmart/feedback-all-spark-miniapp": "npm:0.9.66" "@walmart/financial-wellbeing-feature-app": "npm:1.26.0"
Exception-mini-app-1.8.11
Exception-mini-app-1.8.11
efbf46bdfd4f8bad9ef48ea88cbff612132ac42c
--- package-lock.json @@ -73,7 +73,7 @@ "@walmart/money-auth-shared-components": "0.1.4", "@walmart/onewalmart-miniapp": "1.0.16", "@walmart/pay-stub-miniapp": "0.15.2", - "@walmart/payrollsolution_miniapp": "0.138.2", + "@walmart/payrollsolution_miniapp": "0.138.3", "@walmart/price-changes-mini-app": "1.10.3", "@walmart/profile-feature-app": "1.138.2", "@walmart/react-native-encrypted-storage": "1.1.3", @@ -9507,9 +9507,9 @@ } }, "node_modules/@walmart/payrollsolution_miniapp": { - "version": "0.138.2", - "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.138.2.tgz", - "integrity": "sha512-jAXYVH7kb2scxcpvczDboQDKzmI6c8X+OW8uHuEPhqRDQevjM4O7RVdXwjYL99hW4WfUNvgU+00eDjnkps/cwg==", + "version": "0.138.3", + "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.138.3.tgz", + "integrity": "sha512-z4FHseHWpZKOTzMiSTyBX+A9yl+0BL+YYDHIsOwzcwK1rgYtpmzk3UP2cVHrf9FpETUWNToy+NQCHm0sO+WLlA==", "hasInstallScript": true, "dependencies": { "crypto-js": "^3.3.0", @@ -33536,9 +33536,9 @@ } }, "@walmart/payrollsolution_miniapp": { - "version": "0.138.2", - "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.138.2.tgz", - "integrity": "sha512-jAXYVH7kb2scxcpvczDboQDKzmI6c8X+OW8uHuEPhqRDQevjM4O7RVdXwjYL99hW4WfUNvgU+00eDjnkps/cwg==", + "version": "0.138.3", + "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.138.3.tgz", + "integrity": "sha512-z4FHseHWpZKOTzMiSTyBX+A9yl+0BL+YYDHIsOwzcwK1rgYtpmzk3UP2cVHrf9FpETUWNToy+NQCHm0sO+WLlA==", "requires": { "crypto-js": "^3.3.0", "expo-sharing": "~11.5.0" --- package.json @@ -114,7 +114,7 @@ "@walmart/money-auth-shared-components": "0.1.4", "@walmart/onewalmart-miniapp": "1.0.16", "@walmart/pay-stub-miniapp": "0.15.2", - "@walmart/payrollsolution_miniapp": "0.138.2", + "@walmart/payrollsolution_miniapp": "0.138.3", "@walmart/price-changes-mini-app": "1.10.3", "@walmart/profile-feature-app": "1.138.2", "@walmart/react-native-encrypted-storage": "1.1.3",
bump version
bump version
e333a2c89f7ef89a694361baf19701eb80b84e55
--- .looper.yml @@ -1,6 +1,6 @@ tools: nodejs: - - 20.5.1 + - 23.6.0 sonarscanner: 5.0.1.3006 updateTaskStatusOnGit: true
chore: update looper node version
chore: update looper node version
998f3c5440e2eaa1b835009bca9de8e9700f2b78
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart", - "version": "1.26.0", + "version": "1.26.1", "private": true, "workspaces": [ "core", --- targets/US/android/app/build.gradle @@ -106,8 +106,8 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 938 - versionName "1.26.0" + versionCode 939 + versionName "1.26.1" } signingConfigs { debug { --- targets/US/ios/AllSpark/Info.plist @@ -19,7 +19,7 @@ <string>APPL</string> <key>CFBundleShortVersionString</key> <!-- @customization - default: <string>$(MARKETING_VERSION)</string> --> - <string>1.26.0</string> + <string>1.26.1</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> --- targets/US/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart-us", - "version": "1.26.0", + "version": "1.26.1", "private": true, "scripts": { "android": "react-native run-android",
chore: version bump to 1.26.1
chore: version bump to 1.26.1
6b923d7181e4c7fae01610436ae07d5a41017a35
--- __mocks__/react-native/Libraries/LogBox/LogBox.js @@ -0,0 +1,6 @@ +module.exports = { + __esModule: true, + default: { + ignoreLogs: jest.fn(), + }, +}; --- __tests__/navigation/USHallway/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -6,6 +6,7 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects screenOptions={ { "header": [Function], + "headerBackAccessibilityLabel": "headerBackLabel", "presentation": "modal", "transitionPreset": "SlideFromRightIOS ", } @@ -492,6 +493,7 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects screenOptions={ { "header": [Function], + "headerBackAccessibilityLabel": "headerBackLabel", "presentation": "modal", "transitionPreset": "SlideFromRightIOS ", } --- src/home/translations.ts @@ -57,6 +57,7 @@ export const enUS = { anniversary_year_plural: 'Happy {{count}} year anniversary', birthday: 'Happy birthday', }, + headerBackLabel: 'back', headerTitle: Constants.expoConfig?.name, siteBanner: 'Site', storeBanner: 'Store', @@ -137,6 +138,7 @@ export const esMX = { anniversary_year_plural: '¡Feliz aniversario de {{count}} años', birthday: '¡Feliz cumpleaños', }, + headerBackLabel: 'atrás', headerTitle: Constants.expoConfig?.name, siteBanner: 'Sitio', storeBanner: 'Store', --- src/navigation/USHallway/AssociateHallwayNav/MainStackNav.tsx @@ -83,6 +83,7 @@ import {MainTabsNav} from './Tabs'; import {MyTeamStackNav} from './Tabs/MyTeamStackNav'; import {MainStackMap} from './types'; import {DeveloperMenuFeature} from '@/developerMenu'; +import {useAllsparkTranslation} from '@walmart/allspark-foundation'; //--- Main Stack --- // @@ -347,6 +348,7 @@ const MiniAppScreens = createMiniAppScreens(MainStack, [ export const MainStackNav = () => { const dispatch = useDispatch(); + const {t} = useAllsparkTranslation(['home']); const TimeClockFeature = useTimeClockFeature(); @@ -364,6 +366,7 @@ export const MainStackNav = () => { ...TransitionPresets.SlideFromRightIOS, presentation: 'modal', header: Header, + headerBackAccessibilityLabel: t('headerBackLabel') }} > <MainStack.Screen
chore(ada): ALLSPARK-6062 add header back label with translation (#4221)
chore(ada): ALLSPARK-6062 add header back label with translation (#4221) * chore(ada): ALLSPARK-6062 add header back label with translation * chore(test): ALLSPARK-6062 manual mock for LogBox
0e0664ea67aeaa06a4c25225d36ce0a564d897c8
--- .yarn/patches/react-native-npm-0.73.7-7f2047866d.patch @@ -0,0 +1,13 @@ +diff --git a/third-party-podspecs/boost.podspec b/third-party-podspecs/boost.podspec +index 8e924afd367f1b53031daf164bd78cce7908f56e..7089b210a843242c7b3868149bc821be5b42f758 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://sourceforge.net/projects/boost/files/boost/1.83.0/boost_1_83_0.tar.bz2', + :sha256 => '6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e' } + + # Pinning to the same version as React.podspec. --- package.json @@ -180,7 +180,7 @@ "react-dom": "^18.2.0", "react-hook-form": "^7.51.0", "react-i18next": "^13.3.1", - "react-native": "0.73.7", + "react-native": "patch:react-native@npm%3A0.73.7#~/.yarn/patches/react-native-npm-0.73.7-7f2047866d.patch", "react-native-app-auth": "7.2.0", "react-native-background-timer": "^2.4.1", "react-native-barcode-builder": "^2.0.0", --- targets/US/package.json @@ -184,7 +184,7 @@ "react-dom": "^18.2.0", "react-hook-form": "^7.51.0", "react-i18next": "^13.3.1", - "react-native": "0.73.7", + "react-native": "patch:react-native@npm%3A0.73.7#~/.yarn/patches/react-native-npm-0.73.7-7f2047866d.patch", "react-native-app-auth": "7.2.0", "react-native-background-timer": "^2.4.1", "react-native-barcode-builder": "^2.0.0", --- yarn.lock @@ -7107,7 +7107,7 @@ __metadata: react-dom: "npm:^18.2.0" react-hook-form: "npm:^7.51.0" react-i18next: "npm:^13.3.1" - react-native: "npm:0.73.7" + react-native: "patch:react-native@npm%3A0.73.7#~/.yarn/patches/react-native-npm-0.73.7-7f2047866d.patch" react-native-apollo-devtools-client: "npm:^1.0.4" react-native-app-auth: "npm:7.2.0" react-native-background-timer: "npm:^2.4.1" @@ -19278,6 +19278,56 @@ __metadata: languageName: node linkType: hard +"react-native@patch:react-native@npm%3A0.73.7#~/.yarn/patches/react-native-npm-0.73.7-7f2047866d.patch": + version: 0.73.7 + resolution: "react-native@patch:react-native@npm%3A0.73.7#~/.yarn/patches/react-native-npm-0.73.7-7f2047866d.patch::version=0.73.7&hash=e03956" + dependencies: + "@jest/create-cache-key-function": "npm:^29.6.3" + "@react-native-community/cli": "npm:12.3.6" + "@react-native-community/cli-platform-android": "npm:12.3.6" + "@react-native-community/cli-platform-ios": "npm:12.3.6" + "@react-native/assets-registry": "npm:0.73.1" + "@react-native/codegen": "npm:0.73.3" + "@react-native/community-cli-plugin": "npm:0.73.17" + "@react-native/gradle-plugin": "npm:0.73.4" + "@react-native/js-polyfills": "npm:0.73.1" + "@react-native/normalize-colors": "npm:0.73.2" + "@react-native/virtualized-lists": "npm:0.73.4" + abort-controller: "npm:^3.0.0" + anser: "npm:^1.4.9" + ansi-regex: "npm:^5.0.0" + base64-js: "npm:^1.5.1" + chalk: "npm:^4.0.0" + deprecated-react-native-prop-types: "npm:^5.0.0" + event-target-shim: "npm:^5.0.1" + flow-enums-runtime: "npm:^0.0.6" + invariant: "npm:^2.2.4" + jest-environment-node: "npm:^29.6.3" + jsc-android: "npm:^250231.0.0" + memoize-one: "npm:^5.0.0" + metro-runtime: "npm:^0.80.3" + metro-source-map: "npm:^0.80.3" + mkdirp: "npm:^0.5.1" + nullthrows: "npm:^1.1.1" + pretty-format: "npm:^26.5.2" + promise: "npm:^8.3.0" + react-devtools-core: "npm:^4.27.7" + react-refresh: "npm:^0.14.0" + react-shallow-renderer: "npm:^16.15.0" + regenerator-runtime: "npm:^0.13.2" + scheduler: "npm:0.24.0-canary-efb381bbf-20230505" + stacktrace-parser: "npm:^0.1.10" + whatwg-fetch: "npm:^3.0.0" + ws: "npm:^6.2.2" + yargs: "npm:^17.6.2" + peerDependencies: + react: 18.2.0 + bin: + react-native: cli.js + checksum: 10c0/93c41760f339463e290ec7524b178cbfc843de35bf68dae743d4e269ccee9e4bd3842a4a956eae3fd7a7f698c63a9f1c107d7e8d8e1947e7fb394b24c1f25849 + languageName: node + linkType: hard + "react-query@npm:^3.39.3": version: 3.39.3 resolution: "react-query@npm:3.39.3"
test boost update
test boost update
c8b04dcc6a94533d796c10fd21f725a5e1239aff
--- .looper.yml @@ -25,4 +25,3 @@ flows: - yarn install - yarn run lint - yarn run coverage -
test(ui): dummy commit
test(ui): dummy commit
b1b49cbee82424ab738061a59d0d45209ea4d80c
--- packages/allspark-foundation-hub/__tests__/HubFeature/supplyChain/__snapshots__/ShiftFilter.test.tsx.snap @@ -0,0 +1,106 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`ShiftFilter Test 1: Renders ShiftFiltwwwer component with required elements correctly 1`] = ` +<View + 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={ + { + "alignItems": "center", + "backgroundColor": "#fff", + "borderColor": "#e3e4e5", + "borderRadius": 40, + "borderWidth": 1, + "display": "flex", + "flexDirection": "row", + "justifyContent": "space-between", + "opacity": 1, + "padding": 8, + "width": 109, + } + } + testID="shift-filter-shift123" +> + <View + style={ + { + "alignItems": "center", + "display": "flex", + "flexDirection": "row", + "gap": 10, + } + } + > + <Image + onError={[Function]} + placeholder="KXR:A^%h.AbIj?j??aM|M{" + resizeMode="contain" + source={ + { + "uri": "http://example.com/image.jpg", + } + } + style={ + { + "alignSelf": "flex-start", + "backgroundColor": "#CCE3F8", + "borderRadius": 40, + "height": 36, + "padding": 10, + "width": 36, + } + } + testID="teamImage-shiftFilter" + /> + <View + accessibilityLabel="shift123" + accessibilityRole="button" + accessible={true} + style={ + { + "display": "flex", + "flexDirection": "column", + } + } + > + <Body + UNSAFE_style={ + { + "fontSize": 16, + "fontWeight": "400", + "lineHeight": 24, + } + } + testID="shiftId" + > + shift123 + </Body> + </View> + </View> +</View> +`;
Adding snap
Adding snap
fd05aabbb561ed9cca528ef91d05b17e45718c72
--- package-lock.json @@ -3471,9 +3471,9 @@ "integrity": "sha512-AHAmrkLEH5UtPaDiRqoULERHh3oNv7Dgs0bTC0hO5Z2GdNokAMPT5w8ci8aMcRemcwbtdHjxChgtjbeA38GBdA==" }, "@react-native-community/datetimepicker": { - "version": "3.5.2", - "resolved": "https://npme.walmart.com/@react-native-community/datetimepicker/-/datetimepicker-3.5.2.tgz", - "integrity": "sha512-TWRuAtr/DnrEcRewqvXMLea2oB+YF+SbtuYLHguALLxNJQLl/RFB7aTNZeF+OoH75zKFqtXECXV1/uxQUpA+sg==", + "version": "3.0.9", + "resolved": "https://npme.walmart.com/@react-native-community/datetimepicker/-/datetimepicker-3.0.9.tgz", + "integrity": "sha512-8Hel5K2xQNJsGQleUT5fheO60aO0/KhP9nkbDzfGgv3Cdckrf2xWQs0JK3xUhuDoUztpMZS45jqE2WPS7fBdgA==", "requires": { "invariant": "^2.2.4" } --- package.json @@ -53,7 +53,7 @@ "@react-native-community/async-storage": "^1.11.0", "@react-native-community/cameraroll": "4.1.2", "@react-native-community/clipboard": "^1.5.0", - "@react-native-community/datetimepicker": "^3.0.9", + "@react-native-community/datetimepicker": "3.0.9", "@react-native-community/hooks": "^2.6.0", "@react-native-community/masked-view": "^0.1.10", "@react-native-community/netinfo": "5.9.9",
fixing date time picker to be 3.0.9
fixing date time picker to be 3.0.9
16ba91daec4b4be6178200743f8dece4a63bdc92
--- packages/allspark-foundation-hub/__tests__/HubFeature/Hub/TeamSwitcher.test.tsx @@ -111,7 +111,7 @@ describe.skip('TeamSwitcher', () => { }); //Todo: Fix the test since we are not passing the teamData anymore - it.skip('changes the selected team when a team is pressed', () => { + it('changes the selected team when a team is pressed', () => { const { getByTestId, getByText } = render( <TeamSwitcher onTeamChange={onTeamChange} refetch={refetch} /> ); @@ -127,7 +127,7 @@ describe.skip('TeamSwitcher', () => { ); }); - it.skip('renders the vertical divider correctly', () => { + it('renders the vertical divider correctly', () => { const { getAllByTestId } = render( <TeamSwitcher onTeamChange={onTeamChange} refetch={refetch} /> ); @@ -161,7 +161,7 @@ describe.skip('TeamSwitcher', () => { }); //Todo: Fix the test since we are not passing the teamData anymore - it.skip('displays the selector line and pointer when a team is selected', () => { + it('displays the selector line and pointer when a team is selected', () => { const { getByText, getByTestId } = render( <TeamSwitcher onTeamChange={onTeamChange} refetch={refetch} /> ); @@ -188,7 +188,7 @@ describe.skip('TeamSwitcher', () => { expect(queryByText('No teams available')).toBeNull(); }); - it.skip('ensures flatList is rendering the correct items', () => { + it('ensures flatList is rendering the correct items', () => { const { getByTestId } = render( <TeamSwitcher onTeamChange={onTeamChange} refetch={refetch} /> );
feat(ui): Skip tests for now
feat(ui): Skip tests for now
3204ba802924769c53ada7ab9b7684054f9ae4a8
--- package-lock.json @@ -76,7 +76,7 @@ "@walmart/react-native-sumo-sdk": "2.5.1", "@walmart/receipt-check-miniapp": "1.9.10", "@walmart/redux-store": "3.1.3", - "@walmart/returns-mini-app": "0.13.0", + "@walmart/returns-mini-app": "0.13.1", "@walmart/schedule-mini-app": "0.33.0", "@walmart/settings-mini-app": "1.12.0", "@walmart/shelfavailability-mini-app": "1.5.11", @@ -6054,9 +6054,9 @@ } }, "node_modules/@walmart/returns-mini-app": { - "version": "0.13.0", - "resolved": "https://npme.walmart.com/@walmart/returns-mini-app/-/returns-mini-app-0.13.0.tgz", - "integrity": "sha512-jlntQGqHCGZWXj+WHb5VV+JVKxSyvOHcAzu1g8Q6Lbqu/95c2ohe4/kbCOsnYPfh0voNvs65ZXOhUHVbjUM32Q==", + "version": "0.13.1", + "resolved": "https://npme.walmart.com/@walmart/returns-mini-app/-/returns-mini-app-0.13.1.tgz", + "integrity": "sha512-iiOG1Z1T7FgpV1YXpv58twizBAh4leUySoZsfryF94HzMynUogNHo7jr/bjoUXCREEIx/usvcN0qchXYSSkg0g==", "hasInstallScript": true, "dependencies": { "@walmart/common-utilities-js": "^1.2.10", @@ -25929,9 +25929,9 @@ } }, "@walmart/returns-mini-app": { - "version": "0.13.0", - "resolved": "https://npme.walmart.com/@walmart/returns-mini-app/-/returns-mini-app-0.13.0.tgz", - "integrity": "sha512-jlntQGqHCGZWXj+WHb5VV+JVKxSyvOHcAzu1g8Q6Lbqu/95c2ohe4/kbCOsnYPfh0voNvs65ZXOhUHVbjUM32Q==", + "version": "0.13.1", + "resolved": "https://npme.walmart.com/@walmart/returns-mini-app/-/returns-mini-app-0.13.1.tgz", + "integrity": "sha512-iiOG1Z1T7FgpV1YXpv58twizBAh4leUySoZsfryF94HzMynUogNHo7jr/bjoUXCREEIx/usvcN0qchXYSSkg0g==", "requires": { "@walmart/common-utilities-js": "^1.2.10", "@walmart/virtual-zpl-printer-model": "^0.2.11", --- package.json @@ -118,7 +118,7 @@ "@walmart/react-native-sumo-sdk": "2.5.1", "@walmart/receipt-check-miniapp": "1.9.10", "@walmart/redux-store": "3.1.3", - "@walmart/returns-mini-app": "0.13.0", + "@walmart/returns-mini-app": "0.13.1", "@walmart/schedule-mini-app": "0.33.0", "@walmart/settings-mini-app": "1.12.0", "@walmart/shelfavailability-mini-app": "1.5.11",
version bump 0.13.1 - firebase log refactoring
version bump 0.13.1 - firebase log refactoring
13606ce7f9e8190e430970504c2fee5bd1344cb9
--- src/translations/es-MX.ts @@ -30,7 +30,7 @@ export const esMX = { feedback: 'Comentarios', featureRestrictions: 'Restricciones', whatsNew: 'Novedades en la app', - signInFailed: 'Sign in failed', + signInFailed: 'Error al iniciar sesión', }, updates: { timeToUpdateApp: 'Actualiza Me@Walmart beta app!', @@ -64,21 +64,21 @@ export const esMX = { guestButtonTitle: 'Bienvenidos Invitados!', guestButtonSubtitle: 'Explore trabajos y aprenda sobre Walmart', errorRegisteredText: - 'Thanks for reporting the issue. If this problem persists, check if you are using the latest version of Me@Walmart.', - gotIt: 'Got It', + 'Gracias por reportar el problema. Si el problema persiste, verifica que estés usando la versión más reciente de Me@Walmart.', + gotIt: 'Entendido', }, ssoError: { errorMsg: - 'Sorry – something went wrong. Please share your user ID and site ID to help our team resolve the issue.', - reportIssueTitle: 'Report issue', - required: 'Required', - userId: 'User ID', - siteId: 'Site ID', - optional: 'Optional', - details: 'Please describe the issue', - cancel: 'Cancel', - send: 'Send', - requiredError: 'Please enter all requred fields', + 'Lo sentimos - algo salió mal. Por favor, comparte tu ID de usuario para ayudar a nuestro equipo a solucionar el problema.', + reportIssueTitle: 'Reportar problema', + required: 'Requerido', + userId: 'ID de Usuario', + siteId: 'ID de Sitio', + optional: 'Opcional', + details: 'Por favor, describe el problema', + cancel: 'Cancelar', + send: 'Enviar', + requiredError: 'Por favor, completa todos los campos requeridos', }, whatsNew: { modalTitle: 'Nuevo en Me@Walmart',
spanish translation
spanish translation
c1c5e92d09d3ef86447a937da4627b0c8be58399
--- targets/US/ios/AllSpark.xcodeproj/project.pbxproj @@ -47,8 +47,6 @@ E9AD4B182679309900D8DDD4 /* clockin.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = E9AD4B152679309900D8DDD4 /* clockin.mp3 */; }; E9AD4B192679309900D8DDD4 /* clockout.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = E9AD4B162679309900D8DDD4 /* clockout.mp3 */; }; E9AD4B1A2679309900D8DDD4 /* clockfailure.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = E9AD4B172679309900D8DDD4 /* clockfailure.mp3 */; }; - EE94E3EE2CE5BEA600C6442D /* libswiftXPC.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = EE94E3ED2CE5BEA600C6442D /* libswiftXPC.tbd */; }; - EE94E3F02CE5BEAC00C6442D /* CoreAudioTypes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE94E3EF2CE5BEAC00C6442D /* CoreAudioTypes.framework */; }; F049B46226E00E1400F817E3 /* LaunchScreen-Teflon.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F049B46126E00E1400F817E3 /* LaunchScreen-Teflon.storyboard */; }; F0C92FC2252B9F1E000B5582 /* Temp.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0C92FC1252B9F1E000B5582 /* Temp.swift */; }; F0F40C0D24DDA8F00001739F /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = F0F40C0C24DDA8F00001739F /* GoogleService-Info.plist */; }; @@ -100,8 +98,6 @@ E9AD4B172679309900D8DDD4 /* clockfailure.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = clockfailure.mp3; sourceTree = "<group>"; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; }; - EE94E3ED2CE5BEA600C6442D /* libswiftXPC.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libswiftXPC.tbd; path = usr/lib/swift/libswiftXPC.tbd; sourceTree = SDKROOT; }; - EE94E3EF2CE5BEAC00C6442D /* CoreAudioTypes.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioTypes.framework; path = System/Library/Frameworks/CoreAudioTypes.framework; sourceTree = SDKROOT; }; F01353FD24ED83A70094D840 /* Bogle-Thin.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Bogle-Thin.otf"; path = "AllSpark/Bogle-Thin.otf"; sourceTree = "<group>"; }; F01353FE24ED83A70094D840 /* Bogle-BoldItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Bogle-BoldItalic.otf"; path = "AllSpark/Bogle-BoldItalic.otf"; sourceTree = "<group>"; }; F01353FF24ED83A70094D840 /* Bogle-Light.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Bogle-Light.otf"; path = "AllSpark/Bogle-Light.otf"; sourceTree = "<group>"; }; @@ -128,8 +124,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - EE94E3F02CE5BEAC00C6442D /* CoreAudioTypes.framework in Frameworks */, - EE94E3EE2CE5BEA600C6442D /* libswiftXPC.tbd in Frameworks */, 1AC977DC290CA5AC004F94C9 /* libreact-native-scanner-3.0.a in Frameworks */, 0C19CC4426FB85E2006F71DE /* libresolv.tbd in Frameworks */, 5EF1E00F934B5C7C3B490E55 /* libPods-AllSpark.a in Frameworks */, @@ -202,8 +196,6 @@ 2D16E6871FA4F8E400B85C8A /* Frameworks */ = { isa = PBXGroup; children = ( - EE94E3EF2CE5BEAC00C6442D /* CoreAudioTypes.framework */, - EE94E3ED2CE5BEA600C6442D /* libswiftXPC.tbd */, 1AC977DB290CA5AC004F94C9 /* libreact-native-scanner-3.0.a */, CD1FCE7B27B747FE00A993B8 /* realm-js-ios.xcframework */, CD1FCE7D27B747FE00A993B8 /* realm-monorepo.xcframework */, @@ -347,9 +339,7 @@ LastUpgradeCheck = 1540; TargetAttributes = { 13B07F861A680F5B00A75B9A = { - DevelopmentTeam = F7HDEWM8SU; LastSwiftMigration = 1150; - ProvisioningStyle = Manual; }; }; }; @@ -711,8 +701,8 @@ CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = AllSpark/AllSpark.entitlements; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 71; DEVELOPMENT_TEAM = F7HDEWM8SU; ENABLE_BITCODE = NO; @@ -744,7 +734,7 @@ OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = com.walmart.stores.allspark.beta; PRODUCT_NAME = "Me@Walmart"; - PROVISIONING_PROFILE_SPECIFIER = "Allspark (MeAtWM Beta) Dev"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "AllSpark-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -761,8 +751,8 @@ CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = AllSpark/AllSpark.entitlements; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 71; DEVELOPMENT_TEAM = F7HDEWM8SU; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; @@ -794,7 +784,7 @@ OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; PRODUCT_BUNDLE_IDENTIFIER = com.walmart.stores.allspark.beta; PRODUCT_NAME = "Me@Walmart"; - PROVISIONING_PROFILE_SPECIFIER = MeAtWMBeta_InHouse_Provision; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; @@ -988,4 +978,4 @@ /* End XCConfigurationList section */ }; rootObject = 83CBB9F71A601CBA00E9B192 /* Project object */; -} +} \ No newline at end of file
fix ios build
fix ios build
d0f94ebaf8d7dd08f93265744a89f2c723516d3d
--- packages/celebration-mini-app/src/config/HubConfig.tsx @@ -10,19 +10,29 @@ import React from 'react'; import {AllsparkComponentContainers} from '@walmart/allspark-foundation/Components'; import {HubCelebrationWidget} from '../components/Widget/HubCelebrationWidget'; -// Hub configuration constants for backend implementation -// This follows the consumer-provider pattern where we register with MyTeam's hub -export const CELEBRATIONS_SALARIED_HUB_CONFIG = { - MYTEAM_HUB_ID: 'MyTeam.SalariedHub', - WIDGET_IDS: { - CELEBRATION: 'MyTeam.CelebrationWidget', // Must match MyTeam's configuration - }, +/** + * Core Container IDs + * TODO: This should be imported from @walmart/me-at-walmart-common + * once CORE_CONTAINERS is exported from that package + */ +const CORE_CONTAINERS = { + MY_TEAM: 'MY_WALMART.MY_TEAM', } as const; -// Hub configuration constants for backend implementation -// This follows the consumer-provider pattern where we register with MyTeam's hub -export const CELEBRATIONS_HOURLY_HUB_CONFIG = { - MYTEAM_HUB_ID: 'MyTeam.HourlyHub', +/** + * Hub configuration constants for backend implementation + * + * This follows the consumer-provider pattern where we register with MyTeam's hub. + * The widget is registered to a SINGLE container (MY_WALMART.MY_TEAM) and handles + * user type logic (salaried vs hourly) conditionally within the widget component. + */ +export const CELEBRATIONS_HUB_CONFIG = { + /** + * Single container ID for both salaried and hourly users + * This should match CORE_CONTAINERS.MY_TEAM from @walmart/me-at-walmart-common + * Value: 'MY_WALMART.MY_TEAM' + */ + MYTEAM_HUB_ID: CORE_CONTAINERS.MY_TEAM, WIDGET_IDS: { CELEBRATION: 'MyTeam.CelebrationWidget', // Must match MyTeam's configuration }, @@ -30,6 +40,11 @@ export const CELEBRATIONS_HOURLY_HUB_CONFIG = { /** * Register Celebrations components with the Hub Framework (Backend Implementation) + * + * Registers the Celebration widget to a SINGLE container that serves both + * salaried and hourly users. User type logic is handled conditionally within + * the HubCelebrationWidget component itself. + * * @param isSiteDC - Whether this is a DC site (affects widget configuration) */ export const registerCelebrationsComponents = (isSiteDC: boolean = false) => { @@ -52,20 +67,15 @@ export const registerCelebrationsComponents = (isSiteDC: boolean = false) => { ); }; - // Register Celebration Widget with site-specific configuration - AllsparkComponentContainers.add( - CELEBRATIONS_SALARIED_HUB_CONFIG.MYTEAM_HUB_ID, - CELEBRATIONS_SALARIED_HUB_CONFIG.WIDGET_IDS.CELEBRATION, - CelebrationWidgetWithSiteConfig - ); - + // Register Celebration Widget to the single MY_TEAM container + // User type logic (salaried vs hourly) is handled within the widget AllsparkComponentContainers.add( - CELEBRATIONS_HOURLY_HUB_CONFIG.MYTEAM_HUB_ID, - CELEBRATIONS_HOURLY_HUB_CONFIG.WIDGET_IDS.CELEBRATION, + CELEBRATIONS_HUB_CONFIG.MYTEAM_HUB_ID, + CELEBRATIONS_HUB_CONFIG.WIDGET_IDS.CELEBRATION, CelebrationWidgetWithSiteConfig ); - console.log(`✅ Celebrations components registered with MyTeam hub for ${isSiteDC ? 'DC' : 'Store'} site`); + console.log(`✅ Celebrations widget registered to ${CELEBRATIONS_HUB_CONFIG.MYTEAM_HUB_ID} for ${isSiteDC ? 'DC' : 'Store'} site`); } catch (error) { console.error('❌ Failed to register Celebrations components:', error); throw error;
feat(ui): separate the associate exp team switcher and hub
feat(ui): separate the associate exp team switcher and hub
70f76d84e033c3343ab1798be5f98a1c0f72189a
--- .looper-pr.yml @@ -10,7 +10,7 @@ flows: - (name Enable Corepack) corepack enable - (name Yarn Set Version) yarn set version 4.6.0 - (name Yarn Version) yarn --version - - (name Yarn Install) YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install + - (name Yarn Install) yarn install envs: global: --- .looper.yml @@ -64,7 +64,7 @@ flows: - (name Yarn Install) corepack enable - (name Yarn Set Version) yarn set version 4.6.0 - (name Yarn Version) yarn --version - - (name Install Dependencies) YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install + - (name Install Dependencies) yarn install buildPackages: - (name Build Packages) yarn run build
fix: revert looper config to use standard yarn install
fix: revert looper config to use standard yarn install
f2e7c5c4f3a92108477a22f232b486100b4363f2
--- package-lock.json @@ -104,7 +104,7 @@ "@walmart/schedule-mini-app": "0.94.1", "@walmart/shelfavailability-mini-app": "1.5.23", "@walmart/store-feature-orders": "1.26.5", - "@walmart/taskit-mini-app": "2.81.3", + "@walmart/taskit-mini-app": "2.81.10", "@walmart/time-clock-mini-app": "2.338.1", "@walmart/topstock-mini-app": "1.8.5", "@walmart/ui-components": "1.15.11", @@ -12462,9 +12462,9 @@ } }, "node_modules/@walmart/taskit-mini-app": { - "version": "2.81.3", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.81.3.tgz", - "integrity": "sha512-w2kmi8U7UNWx09Xx1GHhRl8HE6SJ+J2WbfxTMNoEXACPpwxTSaWAhbYAv7zm+ptzgOAfPeHr5bFNcYZizq7fHQ==", + "version": "2.81.10", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.81.10.tgz", + "integrity": "sha512-qW0jU+tCF04fVdFIoS+Q2K7FlCcjNSbhwkuXl4xyxmEOrlwsvQAO9agfRzJPTvEI7vCIi6XtkFPleKl0TW6/Bg==", "peerDependencies": { "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@types/lodash": ">=4.14.176", --- package.json @@ -145,7 +145,7 @@ "@walmart/schedule-mini-app": "0.94.1", "@walmart/shelfavailability-mini-app": "1.5.23", "@walmart/store-feature-orders": "1.26.5", - "@walmart/taskit-mini-app": "2.81.3", + "@walmart/taskit-mini-app": "2.81.10", "@walmart/time-clock-mini-app": "2.338.1", "@walmart/topstock-mini-app": "1.8.5", "@walmart/ui-components": "1.15.11", @@ -406,7 +406,7 @@ "@walmart/schedule-mini-app": "0.94.1", "@walmart/shelfavailability-mini-app": "1.5.23", "@walmart/store-feature-orders": "1.26.5", - "@walmart/taskit-mini-app": "2.81.3", + "@walmart/taskit-mini-app": "2.81.10", "@walmart/time-clock-mini-app": "2.338.1", "@walmart/topstock-mini-app": "1.8.5", "@walmart/ui-components": "1.15.11",
chore: bump taskit version
chore: bump taskit version
22ea52868b601c5f7e0331d1c8b70f7db5e4b7ae
--- package-lock.json @@ -83,7 +83,7 @@ "@walmart/returns-mini-app": "3.8.0", "@walmart/schedule-mini-app": "0.49.0", "@walmart/shelfavailability-mini-app": "1.5.17", - "@walmart/taskit-mini-app": "2.47.7", + "@walmart/taskit-mini-app": "2.47.8", "@walmart/texting-mini-app": "2.0.35", "@walmart/time-clock-mini-app": "2.175.0", "@walmart/topstock-mini-app": "1.2.3", @@ -9188,9 +9188,9 @@ } }, "node_modules/@walmart/taskit-mini-app": { - "version": "2.47.7", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.47.7.tgz", - "integrity": "sha512-f8eL/9FZQxA8NI74vsUhOQMGXGlV5GozX9lA4uCFglps9O0k5yqnFlaTcvO0+KFm+GbbC4dJYAUHJshq4SaUqQ==", + "version": "2.47.8", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.47.8.tgz", + "integrity": "sha512-0DWc8VIl7FH+ZuClhj9GL/yRUxB3M+rpkvrZDAjceVwCAyPoL3Q/dGdZaDaIwg7b5TBRQDbhtp46XXykcJNjzw==", "peerDependencies": { "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@types/lodash": ">=4.14.176", @@ -33947,9 +33947,9 @@ "integrity": "sha512-8QEs//QA9txDVmgmIFhk+9mUSZw3zn2b+9PVGB0xyyAyKZn8+LbzpMqZTuzawF1PmFqfy/UAnMdhsuS80fikIg==" }, "@walmart/taskit-mini-app": { - "version": "2.47.7", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.47.7.tgz", - "integrity": "sha512-f8eL/9FZQxA8NI74vsUhOQMGXGlV5GozX9lA4uCFglps9O0k5yqnFlaTcvO0+KFm+GbbC4dJYAUHJshq4SaUqQ==" + "version": "2.47.8", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.47.8.tgz", + "integrity": "sha512-0DWc8VIl7FH+ZuClhj9GL/yRUxB3M+rpkvrZDAjceVwCAyPoL3Q/dGdZaDaIwg7b5TBRQDbhtp46XXykcJNjzw==" }, "@walmart/tcnumber": { "version": "2.3.3", --- package.json @@ -124,7 +124,7 @@ "@walmart/returns-mini-app": "3.8.0", "@walmart/schedule-mini-app": "0.49.0", "@walmart/shelfavailability-mini-app": "1.5.17", - "@walmart/taskit-mini-app": "2.47.7", + "@walmart/taskit-mini-app": "2.47.8", "@walmart/texting-mini-app": "2.0.35", "@walmart/time-clock-mini-app": "2.175.0", "@walmart/topstock-mini-app": "1.2.3",
chore: bump taskit@2.47.8
chore: bump taskit@2.47.8
2a0b238bd96d1ae2eaade80c0b25d9710ade818c
--- packages/allspark-foundation/src/Components/ComponentContainers.tsx @@ -89,6 +89,10 @@ export class ComponentContainer<Props = {}> { } }; + /** + * Wrap each added component in this wrapper component when using Layout and List functions + * @param componentWrapper - Component to wrap around every added component + */ public addComponentWrapper = (componentWrapper: ComponentType) => { this._componentWrapper = componentWrapper; }; @@ -175,7 +179,7 @@ export class ComponentContainer<Props = {}> { }; /** - * Renders a specific component added to the container with the given props + * Renders a specific component added to the container with the given props. * @param props.id - The ID of the component to render. * @param props - Props to pass to the component. * @example @@ -199,6 +203,7 @@ export class ComponentContainer<Props = {}> { * An extension of the `Layout` component from '@walmart/allspark-utils'. * * Useful if needing to organize components into a grid or in a certain order. + * Wraps ComponentWrapper around each component if defined */ public Layout = (props: ComponentLayoutConfig<Props>) => { const config = Object.fromEntries(this._components.entries()); @@ -214,6 +219,7 @@ export class ComponentContainer<Props = {}> { /** * Renders all components added to the container with the given props + * Wraps ComponentWrapper around each component if defined * @param props - Props to pass to the components. * @example * <ComponentContainer.Container {...props} />
chore(layout): updated jsdocs to reflect component wrapper changes
chore(layout): updated jsdocs to reflect component wrapper changes
40a55c46e5bf9b95151abedc9481c09059836b44
--- src/screens/MeganavScreen.tsx @@ -18,6 +18,7 @@ import {PresenceProvider} from '../presence/provider'; import {ChannelsProvider} from '../channels'; import {navigate} from '@walmart/react-native-shared-navigation'; import {Button} from '@walmart/gtp-shared-components/dist'; +import {ClockedOutScreenGuard} from '../components/ClockedOutScreenGuard'; const styles = StyleSheet.create({ screen: { @@ -99,43 +100,47 @@ export const MeganavScreen: React.FC<MeganavScreenProps> = (props) => { navigate('myTeam.tabs'); }; return ( - <PresenceProvider> - <ChannelsProvider> - <View style={styles.screen}> - <SafeAreaView style={styles.safeAreaView}> - <TouchableWithoutFeedback - testID='backdropButton' - onPress={navigateToPreviousScreen} - style={styles.bottomSheetBackground}> - <View style={styles.bottomSheetBackgroundContent} /> - </TouchableWithoutFeedback> - <View style={styles.innerContainer}> - <View style={styles.topContainer}> - <TouchableOpacity - testID='closeButton' - onPress={navigateToPreviousScreen} - style={styles.closeButton}> - <CloseIcon size={'medium'} /> - </TouchableOpacity> - <View> - <Text style={styles.headerText}>Messages</Text> + <ClockedOutScreenGuard> + <PresenceProvider> + <ChannelsProvider> + <View style={styles.screen}> + <SafeAreaView style={styles.safeAreaView}> + <TouchableWithoutFeedback + testID='backdropButton' + onPress={navigateToPreviousScreen} + style={styles.bottomSheetBackground}> + <View style={styles.bottomSheetBackgroundContent} /> + </TouchableWithoutFeedback> + <View style={styles.innerContainer}> + <View style={styles.topContainer}> + <TouchableOpacity + testID='closeButton' + onPress={navigateToPreviousScreen} + style={styles.closeButton}> + <CloseIcon size={'medium'} /> + </TouchableOpacity> + <View> + <Text style={styles.headerText}>Messages</Text> + </View> </View> - </View> - <ChannelsScreen - navigation={navigation} - newMessageButtonOffset={{x: 16, y: 95}} - /> - <View style={styles.btnInfoContainer}> - <View style={styles.rosterBtnInfoContainer}> - <Button testID='viewRosterButton' onPress={navigateToRoster}> - <Text>View Roster</Text> - </Button> + <ChannelsScreen + navigation={navigation} + newMessageButtonOffset={{x: 16, y: 95}} + /> + <View style={styles.btnInfoContainer}> + <View style={styles.rosterBtnInfoContainer}> + <Button + testID='viewRosterButton' + onPress={navigateToRoster}> + <Text>View Roster</Text> + </Button> + </View> </View> </View> - </View> - </SafeAreaView> - </View> - </ChannelsProvider> - </PresenceProvider> + </SafeAreaView> + </View> + </ChannelsProvider> + </PresenceProvider> + </ClockedOutScreenGuard> ); }; --- src/screens/MeganavScreen.tsx @@ -18,6 +18,7 @@ import {PresenceProvider} from '../presence/provider'; import {ChannelsProvider} from '../channels'; import {navigate} from '@walmart/react-native-shared-navigation'; import {Button} from '@walmart/gtp-shared-components/dist'; +import {ClockedOutScreenGuard} from '../components/ClockedOutScreenGuard'; const styles = StyleSheet.create({ screen: { @@ -99,43 +100,47 @@ export const MeganavScreen: React.FC<MeganavScreenProps> = (props) => { navigate('myTeam.tabs'); }; return ( - <PresenceProvider> - <ChannelsProvider> - <View style={styles.screen}> - <SafeAreaView style={styles.safeAreaView}> - <TouchableWithoutFeedback - testID='backdropButton' - onPress={navigateToPreviousScreen} - style={styles.bottomSheetBackground}> - <View style={styles.bottomSheetBackgroundContent} /> - </TouchableWithoutFeedback> - <View style={styles.innerContainer}> - <View style={styles.topContainer}> - <TouchableOpacity - testID='closeButton' - onPress={navigateToPreviousScreen} - style={styles.closeButton}> - <CloseIcon size={'medium'} /> - </TouchableOpacity> - <View> - <Text style={styles.headerText}>Messages</Text> + <ClockedOutScreenGuard> + <PresenceProvider> + <ChannelsProvider> + <View style={styles.screen}> + <SafeAreaView style={styles.safeAreaView}> + <TouchableWithoutFeedback + testID='backdropButton' + onPress={navigateToPreviousScreen} + style={styles.bottomSheetBackground}> + <View style={styles.bottomSheetBackgroundContent} /> + </TouchableWithoutFeedback> + <View style={styles.innerContainer}> + <View style={styles.topContainer}> + <TouchableOpacity + testID='closeButton' + onPress={navigateToPreviousScreen} + style={styles.closeButton}> + <CloseIcon size={'medium'} /> + </TouchableOpacity> + <View> + <Text style={styles.headerText}>Messages</Text> + </View> </View> - </View> - <ChannelsScreen - navigation={navigation} - newMessageButtonOffset={{x: 16, y: 95}} - /> - <View style={styles.btnInfoContainer}> - <View style={styles.rosterBtnInfoContainer}> - <Button testID='viewRosterButton' onPress={navigateToRoster}> - <Text>View Roster</Text> - </Button> + <ChannelsScreen + navigation={navigation} + newMessageButtonOffset={{x: 16, y: 95}} + /> + <View style={styles.btnInfoContainer}> + <View style={styles.rosterBtnInfoContainer}> + <Button + testID='viewRosterButton' + onPress={navigateToRoster}> + <Text>View Roster</Text> + </Button> + </View> </View> </View> - </View> - </SafeAreaView> - </View> - </ChannelsProvider> - </PresenceProvider> + </SafeAreaView> + </View> + </ChannelsProvider> + </PresenceProvider> + </ClockedOutScreenGuard> ); };
adding screen guard to meganav
adding screen guard to meganav
cdaaebd16381d7ea6b6d6fb9535bf92079d9f0d4
--- package.json @@ -96,7 +96,7 @@ "@walmart/metrics-mini-app": "0.9.5", "@walmart/mod-flex-mini-app": "1.0.0", "@walmart/moment-walmart": "1.0.4", - "@walmart/payrollsolution_miniapp": "^0.125.8", + "@walmart/payrollsolution_miniapp": "0.125.8", "@walmart/price-changes-mini-app": "^1.4.6", "@walmart/profile-feature-app": "0.0.39", "@walmart/push-to-talk-mini-app": "1.8.4",
fix issue
fix issue
3beccabd9e1bcdf9ca0dc4d8d55cada1c1836ef8
--- package-lock.json @@ -3380,9 +3380,9 @@ } }, "@walmart/manager-approvals-miniapp": { - "version": "0.0.44", - "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.0.44.tgz", - "integrity": "sha512-hRUlnDCCzEzWlT24sx/YkpRWLMiKEd5I1WsXmnnLHjwHcd9ksOGwKnVxgeBH9dY8Qc87h4X2iVe1nbA+3VfwpA==" + "version": "0.0.45", + "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.0.45.tgz", + "integrity": "sha512-xEgNpfReOZm+KAapAnqpW1+cdI0UL3LlILohFWZUFUO+U+1BFL3zAic5JSZttF8HiOfdiQ4v1Pre3rb5EIJ1+A==" }, "@walmart/metrics-mini-app": { "version": "0.4.11", --- package.json @@ -77,7 +77,7 @@ "@walmart/ims-print-services-ui": "0.0.30", "@walmart/inbox-mini-app": "0.0.101", "@walmart/iteminfo-mini-app": "2.0.1", - "@walmart/manager-approvals-miniapp": "0.0.44", + "@walmart/manager-approvals-miniapp": "0.0.45", "@walmart/metrics-mini-app": "0.4.11", "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.5.21",
Updated version
Updated version
5a009c4805e87145d882e30bab1eb33e57d1a2e2
--- packages/allspark-utils/src/eventManager.ts @@ -1,9 +1,14 @@ import { uniqueId } from 'lodash'; +import { QueueManager } from './queue'; export type EventListener<P> = (payload: P) => void; export type ListenerSubscription = { remove: () => void }; +export type EventManagerConfig = { queueUnhandledEvents: boolean }; + +const DEFAULT_MANAGER_CONFIG = { queueUnhandledEvents: true }; + /** * A class that manages events and their listeners. * @@ -19,52 +24,87 @@ export class EventManager< EventPayloadMap extends Record<any, any>, E extends keyof EventPayloadMap = keyof EventPayloadMap > { + // Config for event manager + private _config: EventManagerConfig; + + // Map of event types to their listeners private _listeners = {} as Record< E, Map<string, EventListener<EventPayloadMap[E]>> >; - constructor(events: E[]) { + // Queue manager for unhandled events + private _queue = {} as QueueManager<EventPayloadMap[E], E>; + + constructor(events: E[], config?: EventManagerConfig) { + this._config = config || DEFAULT_MANAGER_CONFIG; + this._listeners = events.reduce((map, event) => { map[event] = new Map(); return map; }, {} as Record<E, Map<string, EventListener<EventPayloadMap[E]>>>); + + this._queue = new QueueManager(events); } + /** + * Returns whether or not the queue has the event + */ public hasEvent = <K extends E>(event: K) => { return !!this._listeners[event]; }; - // Call all listeners for given event with payload + /** + * 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; + }; + + /** + * Run event and payload through all listeners + */ public runEvent = <K extends E>(event: K, payload: EventPayloadMap[K]) => { - if (this.hasEvent(event)) { + if (this.hasListener(event)) { this._listeners[event].forEach((listener) => listener(payload)); + } else if (this._config.queueUnhandledEvents) { + this._queue.enqueue(event, payload); } else { console.warn(`Cannot run undefined event ${event.toString()}`); } }; + /** + * Run event and payload through a single listener + */ public runEventListener = <K extends E>( event: K, id: string, payload: EventPayloadMap[K] ) => { - if (this.hasEvent(event)) { + if (this.hasListener(event)) { const listener = this._listeners[event].get(id); listener?.(payload); + } else if (this._config.queueUnhandledEvents) { + // @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()}`); } }; - // Remove listener for event by id + /** + * Remove listener from event + */ public removeListener = <K extends E>(event: K, id: string) => { if (this.hasEvent(event)) { this._listeners[event].delete(id); } }; - // Generate id, add listener to event map, return remove + /** + * Add listener to event + */ public addListener = <K extends E>( event: K, listener: EventListener<EventPayloadMap[K]>, @@ -84,6 +124,11 @@ export class EventManager< listener as EventListener<EventPayloadMap[E]> ); + // Run any queued events + this._queue.flush(event, (payload) => { + this.runEvent(event, payload); + }); + // Return subscription to remove listener if needed return { remove: () => this.removeListener(event, id) }; };
feat: add option to queue unhandled events until listener is added. default to true
feat: add option to queue unhandled events until listener is added. default to true
d5ae33e5f17c35c949cb3cebd482b18bc291da93
--- android/app/build.gradle @@ -134,8 +134,8 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 147 - versionName "1.1.0" + versionCode 197 + versionName "1.2.0" } splits { abi { --- ios/AllSpark/Info.plist @@ -17,7 +17,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.1.0</string> + <string>1.2.0</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>147</string> + <string>197</string> <key>FirebaseAutomaticScreenReportingEnabled</key> <false /> <key>LSApplicationQueriesSchemes</key> --- package-lock.json @@ -1,6 +1,6 @@ { "name": "allspark-main", - "version": "1.1.0", + "version": "1.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { --- package.json @@ -1,6 +1,6 @@ { "name": "allspark-main", - "version": "1.1.0", + "version": "1.2.0", "private": true, "scripts": { "firebase:dev": "cp ./ios/GoogleService-Info-Dev.plist ./ios/GoogleService-Info.plist && cp ./android/app/google-services-dev.json ./android/app/google-services.json",
updated the version code
updated the version code
5d39e5f0c935d948d314d188a07c41e91d080dc2
--- package-lock.json @@ -85,7 +85,7 @@ "@walmart/schedule-mini-app": "0.63.0", "@walmart/shelfavailability-mini-app": "1.5.18", "@walmart/store-feature-orders": "1.24.0", - "@walmart/taskit-mini-app": "2.53.1", + "@walmart/taskit-mini-app": "2.53.2", "@walmart/texting-mini-app": "2.1.3", "@walmart/time-clock-mini-app": "2.175.2", "@walmart/topstock-mini-app": "1.4.8", @@ -9765,9 +9765,9 @@ } }, "node_modules/@walmart/taskit-mini-app": { - "version": "2.53.1", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.53.1.tgz", - "integrity": "sha512-YwhIrB9OQfL2+hSe31aWt2wE+F5NIMdHhS6trEJ4CRtZzrV2GPfZaK/3L5gZV9G1jaPJOT3Z9poswQIBG6S5aw==", + "version": "2.53.2", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.53.2.tgz", + "integrity": "sha512-pdDJCi08d+IQ3iOkYfiWQiAC94Fzo1MWeMZ3P8rhNqQttTwsznfNex+6Y4oiT0/eFsxbDApGipOVZPXky/QUhg==", "peerDependencies": { "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@types/lodash": ">=4.14.176", @@ -33572,9 +33572,9 @@ "integrity": "sha512-6opFXMOFCSdQMSgscCRSoOYwh9BLbm3IQZ1bCjDW7YFLZU+UNwl41u1jCOrygr3UAuUsJFK7Bi7CAqkZQ7Zd2w==" }, "@walmart/taskit-mini-app": { - "version": "2.53.1", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.53.1.tgz", - "integrity": "sha512-YwhIrB9OQfL2+hSe31aWt2wE+F5NIMdHhS6trEJ4CRtZzrV2GPfZaK/3L5gZV9G1jaPJOT3Z9poswQIBG6S5aw==" + "version": "2.53.2", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.53.2.tgz", + "integrity": "sha512-pdDJCi08d+IQ3iOkYfiWQiAC94Fzo1MWeMZ3P8rhNqQttTwsznfNex+6Y4oiT0/eFsxbDApGipOVZPXky/QUhg==" }, "@walmart/tcnumber": { "version": "2.3.3", --- package.json @@ -126,7 +126,7 @@ "@walmart/schedule-mini-app": "0.63.0", "@walmart/shelfavailability-mini-app": "1.5.18", "@walmart/store-feature-orders": "1.24.0", - "@walmart/taskit-mini-app": "2.53.1", + "@walmart/taskit-mini-app": "2.53.2", "@walmart/texting-mini-app": "2.1.3", "@walmart/time-clock-mini-app": "2.175.2", "@walmart/topstock-mini-app": "1.4.8",
Updated notes version
Updated notes version
c03f279cfede932132683ad6c45f45674725bf44
--- package-lock.json @@ -17323,9 +17323,9 @@ "integrity": "sha512-zTOSJ7BMbGHaqAF8+LDQI/s5winKcxsHSe4hv49gUbfDz19v71apgNchz31W1D2UQP+kNgrglrmCdmr5RdI8mw==" }, "react-native-wm-voice-text": { - "version": "0.5.0", - "resolved": "https://npme.walmart.com/react-native-wm-voice-text/-/react-native-wm-voice-text-0.5.0.tgz", - "integrity": "sha512-PKaL0MFy+VjTT4wcx/v90BlvlRXgdWGUU8Sz/760A2Esj175A8w/vFQCtZhUer5FVxmpYVKk7nHzoewii4ygRw==" + "version": "0.6.0", + "resolved": "https://npme.walmart.com/react-native-wm-voice-text/-/react-native-wm-voice-text-0.6.0.tgz", + "integrity": "sha512-5XwA0/NyFTqF2QqPeSs89LrK2337a2pfoLX44HlRCXLeHOVbZjC+CFkCuMW6k1u+RnSbDv3ROR44jdV6Dul+9A==" }, "react-query": { "version": "3.34.17", --- package.json @@ -171,7 +171,7 @@ "react-native-wm-network": "^0.2.0", "react-native-wm-notification": "^2.0.1", "react-native-wm-telemetry": "^0.3.0", - "react-native-wm-voice-text": "^0.5.0", + "react-native-wm-voice-text": "^0.6.0", "react-redux": "^7.2.1", "realm": "10.8.0", "redux": "^4.0.5",
stt bump
stt bump
866edee2f059055e17691e1c72490f2b86d524b0
--- package-lock.json @@ -5439,9 +5439,9 @@ "integrity": "sha512-uCC2Hk4fRcAC49c4uuIpLpD3geWjG7uAQByH8ygekhQKPrijc5/F1/z+Tkt3zFQ88BlsE+ihQ6z3AWFzAyuNGw==" }, "@walmart/profile-feature-app": { - "version": "0.0.60", - "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.0.60.tgz", - "integrity": "sha512-Xf+C/kQdCpe2Yup3oGfGHTxluf29bD0GZ2jJPqKtYXBbkCxAgeDC1l4FNDDXqJxaew/ZdCtQGToXpNLuMtoRMg==" + "version": "0.0.61", + "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.0.61.tgz", + "integrity": "sha512-5uJjndO7vRsL5pFEYmRPzT2ZZ0SFK1q7xWTV7BWDW9Y0BpX1oUVJaeLHqm2TZa/H9WbMXFRTjRcpri0A9ysuLw==" }, "@walmart/push-to-talk-mini-app": { "version": "1.8.9", --- package.json @@ -105,7 +105,7 @@ "@walmart/pay-stub-miniapp": "0.7.1", "@walmart/payrollsolution_miniapp": "0.126.54", "@walmart/price-changes-mini-app": "1.4.11", - "@walmart/profile-feature-app": "0.0.60", + "@walmart/profile-feature-app": "0.0.61", "@walmart/push-to-talk-mini-app": "1.8.9", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "^0.2.0",
Bumped Profile-feature-app to 0.0.61
Bumped Profile-feature-app to 0.0.61
b77341e17cfd5bb5ff85902d2ccdd71486043705
--- src/components/AssociateRosterItem/index.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import {StyleSheet, Text, View} from 'react-native'; +import {StyleSheet, Text, View, TouchableOpacity} from 'react-native'; import {shallowEqual} from 'react-redux'; import namecase from 'namecase'; import { @@ -35,7 +35,6 @@ import {styles} from './style'; import {useTranslation} from 'react-i18next'; import {TEXTING_I18N_NAMESPACE} from '../../translations'; import {messageButtonEnabled, pushToTalkEnabled} from '../../redux/selectors'; -import {TouchableOpacity} from 'react-native-gesture-handler'; export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { const {associate, first, last, style, replace = false} = props; const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); @@ -65,9 +64,8 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { const shouldShowMessageAndPttButton = associate?.win?.toString() !== currentUser?.win?.toString(); const isStoreScheduleValid = - associate?.storeSchedule?.length !== undefined && - associate?.storeSchedule?.length > 0; - const topStyle = isStoreScheduleValid ? -16 : 0; + associate?.storeSchedule && associate?.storeSchedule?.length > 0; + const tagActivatedStyle = isStoreScheduleValid ? -16 : 0; return ( <Card UNSAFE_style={[ @@ -88,7 +86,7 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { <StatusChip associate={associate} encryptedId={encryptedId} - style={[styles.tag, {marginTop: topStyle}]} + style={[styles.tag, {marginTop: tagActivatedStyle}]} /> {shouldShowMessageAndPttButton && ( <View style={styles.buttonsStyle}> @@ -146,7 +144,7 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { weight='400' size='small' numberOfLines={1} - UNSAFE_style={{textDecorationLine: 'underline'}}> + UNSAFE_style={styles.viewSchedule}> {t('rosterScreen.associateRosterItem.viewSchedule')} </Body> </TouchableOpacity> --- src/components/AssociateRosterItem/style.ts @@ -36,10 +36,8 @@ export const styles = StyleSheet.create({ alignSelf: 'flex-end', marginBottom: 8, }, - viewScheduleButton: { - marginTop: 6, - alignSelf: 'flex-start', - marginLeft: -14, + viewSchedule: { + textDecorationLine: 'underline', }, buttonsStyle: {flexDirection: 'row', alignItems: 'center'}, pushToTalkBtn: {marginRight: 8}, --- src/components/AssociateRosterItem/index.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import {StyleSheet, Text, View} from 'react-native'; +import {StyleSheet, Text, View, TouchableOpacity} from 'react-native'; import {shallowEqual} from 'react-redux'; import namecase from 'namecase'; import { @@ -35,7 +35,6 @@ import {styles} from './style'; import {useTranslation} from 'react-i18next'; import {TEXTING_I18N_NAMESPACE} from '../../translations'; import {messageButtonEnabled, pushToTalkEnabled} from '../../redux/selectors'; -import {TouchableOpacity} from 'react-native-gesture-handler'; export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { const {associate, first, last, style, replace = false} = props; const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); @@ -65,9 +64,8 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { const shouldShowMessageAndPttButton = associate?.win?.toString() !== currentUser?.win?.toString(); const isStoreScheduleValid = - associate?.storeSchedule?.length !== undefined && - associate?.storeSchedule?.length > 0; - const topStyle = isStoreScheduleValid ? -16 : 0; + associate?.storeSchedule && associate?.storeSchedule?.length > 0; + const tagActivatedStyle = isStoreScheduleValid ? -16 : 0; return ( <Card UNSAFE_style={[ @@ -88,7 +86,7 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { <StatusChip associate={associate} encryptedId={encryptedId} - style={[styles.tag, {marginTop: topStyle}]} + style={[styles.tag, {marginTop: tagActivatedStyle}]} /> {shouldShowMessageAndPttButton && ( <View style={styles.buttonsStyle}> @@ -146,7 +144,7 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { weight='400' size='small' numberOfLines={1} - UNSAFE_style={{textDecorationLine: 'underline'}}> + UNSAFE_style={styles.viewSchedule}> {t('rosterScreen.associateRosterItem.viewSchedule')} </Body> </TouchableOpacity> --- src/components/AssociateRosterItem/style.ts @@ -36,10 +36,8 @@ export const styles = StyleSheet.create({ alignSelf: 'flex-end', marginBottom: 8, }, - viewScheduleButton: { - marginTop: 6, - alignSelf: 'flex-start', - marginLeft: -14, + viewSchedule: { + textDecorationLine: 'underline', }, buttonsStyle: {flexDirection: 'row', alignItems: 'center'}, pushToTalkBtn: {marginRight: 8},
Added requested changes
Added requested changes
00e964f529abdd17a8ca3147e7898dbf121e7ed9
--- package.json @@ -111,7 +111,7 @@ "@walmart/impersonation-mini-app": "1.20.8", "@walmart/ims-print-services-ui": "2.11.1", "@walmart/inbox-mini-app": "0.93.28", - "@walmart/iteminfo-mini-app": "7.13.0", + "@walmart/iteminfo-mini-app": "7.13.2", "@walmart/learning-mini-app": "20.0.21", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-at-walmart-athena-queries": "6.1.4", --- yarn.lock @@ -6292,10 +6292,11 @@ __metadata: languageName: node linkType: hard -"@walmart/iteminfo-mini-app@npm:7.13.0": - version: 7.13.0 - resolution: "@walmart/iteminfo-mini-app@npm:7.13.0" +"@walmart/iteminfo-mini-app@npm:7.13.2": + version: 7.13.2 + resolution: "@walmart/iteminfo-mini-app@npm:7.13.2" peerDependencies: + "@apollo/client": ^3.7.3 "@react-navigation/drawer": ">=6.3.0" "@react-navigation/native": ">=6.0.0" "@react-navigation/stack": ">=6.1.0" @@ -6315,13 +6316,14 @@ __metadata: "@walmart/redux-store": ">=3.5.0" "@walmart/ui-components": ">=1.15.1" dayjs: ">=1.11.5" + expo: ^49.0.0 + expo-linear-gradient: ^12.7.2 lodash: ">=4.17.21" react: ">=18.2.0" react-native: ">=0.72.6" react-native-barcode-builder: ">=2.0.0" react-native-device-info: ">=10.3.0" react-native-gesture-handler: ">=2.13.1" - react-native-linear-gradient: ">=2.6.2" react-native-permissions: ">=3.6.1" react-native-qrcode-svg: ">=6.1.2" react-native-safe-area-context: ">=4.7.2" @@ -6335,7 +6337,7 @@ __metadata: reselect: ">=4.1.0" uuid: ">=3.3.2" victory-native: ">=36.5.0" - checksum: 10c0/5ef2fb32c8f2fd3e52b2ad494e233b17992b51dbe62a9daeb8e36159841b80cef12293c9011a55bcb56a6ee2b4917e98bfe90d35fd6003359df7978bfbbad3df + checksum: 10c0/85bbf709bcfc70af1aaed1873b2023299c6cc5cb88c01c71c8d75fc873edef11fe0ab48273825b8c10123c6b0e3030d10d94f2ef15f2354954aa7f1d3ba25225 languageName: node linkType: hard @@ -7733,7 +7735,7 @@ __metadata: "@walmart/impersonation-mini-app": "npm:1.20.8" "@walmart/ims-print-services-ui": "npm:2.11.1" "@walmart/inbox-mini-app": "npm:0.93.28" - "@walmart/iteminfo-mini-app": "npm:7.13.0" + "@walmart/iteminfo-mini-app": "npm:7.13.2" "@walmart/learning-mini-app": "npm:20.0.21" "@walmart/manager-approvals-miniapp": "npm:0.2.4" "@walmart/me-at-walmart-athena-queries": "npm:6.1.4"
added expo support
added expo support
332426a6df9e0f52a3cd3a23cd833779b5fcf1ec
--- targets/US/package.json @@ -101,7 +101,7 @@ "@walmart/counts-component-miniapp": "0.1.13", "@walmart/emergency-mini-app": "1.29.8", "@walmart/exception-mini-app": "1.8.11", - "@walmart/facilities-management-miniapp": "0.14.6", + "@walmart/facilities-management-miniapp": "0.15.9", "@walmart/feedback-all-spark-miniapp": "0.9.66", "@walmart/financial-wellbeing-feature-app": "1.26.0", "@walmart/functional-components": "~6.3.20", --- yarn.lock @@ -6363,12 +6363,12 @@ __metadata: languageName: node linkType: hard -"@walmart/facilities-management-miniapp@npm:0.14.6": - version: 0.14.6 - resolution: "@walmart/facilities-management-miniapp@npm:0.14.6" +"@walmart/facilities-management-miniapp@npm:0.15.9": + version: 0.15.9 + resolution: "@walmart/facilities-management-miniapp@npm:0.15.9" peerDependencies: "@walmart/allspark-foundation": "*" - checksum: 10c0/c7d728a946a8593d3db3aad00eef1138358a3cb2a73b979059b48995e86537e2689c43460d3be6b69694a942baec985152dd870be4c74b8ef8caa7203cd72ffa + checksum: 10c0/31fc3971f0488224e2b947799144657b16772b51772b7c120a9219bb33e6155ec24a20ae724d3b717e6955d8771bb86728428bba621aa91c0571ae26da8ec683 languageName: node linkType: hard @@ -7008,7 +7008,7 @@ __metadata: "@walmart/counts-component-miniapp": "npm:0.1.13" "@walmart/emergency-mini-app": "npm:1.29.8" "@walmart/exception-mini-app": "npm:1.8.11" - "@walmart/facilities-management-miniapp": "npm:0.14.6" + "@walmart/facilities-management-miniapp": "npm:0.15.9" "@walmart/feedback-all-spark-miniapp": "npm:0.9.66" "@walmart/financial-wellbeing-feature-app": "npm:1.26.0" "@walmart/functional-components": "npm:~6.3.20"
FixIT - Drop 27
FixIT - Drop 27