commit_hash
stringlengths
40
40
input
stringlengths
13
7.99k
output
stringlengths
5
155
full_message
stringlengths
6
8.96k
1d732c11096a4f0496254e42ecc3b97f9ebe5c90
--- __tests__/navigation/AssociateHallwayNav/__snapshots__/DrawerNavTest.tsx.snap @@ -19,9 +19,18 @@ exports[`DrawerButton getHeaderLeft returns DrawerButton 1`] = ` } testID="MenuButton" > - <MenuIcon - color="white" - size={24} + <Image + source={ + Object { + "testUri": "../../../src/images/assets/menu-icon.png", + } + } + style={ + Object { + "height": 24, + "width": 24, + } + } /> </View> `; @@ -45,9 +54,18 @@ exports[`DrawerButton matches snapshot 1`] = ` } testID="MenuButton" > - <MenuIcon - color="white" - size={24} + <Image + source={ + Object { + "testUri": "../../../src/images/assets/menu-icon.png", + } + } + style={ + Object { + "height": 24, + "width": 24, + } + } /> </View> `; --- src/images/assets/index.ts @@ -19,6 +19,7 @@ const Images: {[key: string]: ImageURISource} = { LandingIllustration: require('./landing-illustration.png'), LandingIllustration2: require('./landing-illustration2.png'), LocationIllustration: require('./location-illustration.png'), + MenuIcon: require('./menu-icon.png'), MeTab: require('./me-tab.png'), MeTabActive: require('./me-tab-active.png'), NotificationsIllustration: require('./notifications-illustration.png'), --- src/images/assets/menu-icon.png Binary files /dev/null and b/src/images/assets/menu-icon.png differ --- src/images/assets/menu-icon@2x.png Binary files /dev/null and b/src/images/assets/menu-icon@2x.png differ --- src/images/assets/menu-icon@3x.png Binary files /dev/null and b/src/images/assets/menu-icon@3x.png differ --- src/navigation/AssociateHallwayNav/DrawerNav.tsx @@ -1,6 +1,6 @@ __DEV__ && console.log('loading drawer nav'); import React, {useEffect, useMemo, useState} from 'react'; -import {StyleSheet, TouchableOpacity} from 'react-native'; +import {StyleSheet, TouchableOpacity, Image} from 'react-native'; import {createDrawerNavigator, useIsDrawerOpen} from '@react-navigation/drawer'; import {createStackNavigator} from '@react-navigation/stack'; import { @@ -16,10 +16,10 @@ import i18next from 'i18next'; import {Header} from '@walmart/ui-components'; import {HeaderProps} from '@walmart/ui-components/components/Header'; import WmTelemetry from 'react-native-wm-telemetry'; -import {MenuIcon} from '@walmart/gtp-shared-components'; import appJson from '../../../app.json'; import {getIsImpersonated} from '../../redux/UserSelector'; +import {Images} from '../../images'; import {MainTabsNav} from './MainTabsNav'; import {SideMenuContent} from './SideMenuContent'; @@ -36,6 +36,10 @@ export const styles = StyleSheet.create({ headerLeftContainer: { marginLeft: 0, }, + menuIcon: { + height: 24, + width: 24, + }, }); export const getMainHeaderTitle = (route: any) => { @@ -86,7 +90,7 @@ export const DrawerButton = () => { testID='MenuButton' onPress={toggleDrawer} style={styles.drawerButton}> - <MenuIcon size={24} color='white' /> + <Image source={Images.MenuIcon} style={styles.menuIcon} /> </TouchableOpacity> ); };
Updating the menu icon
Updating the menu icon
445f5624f0872649d586b6d229c5944bd75476a6
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.15.39", + "version": "1.15.40", "main": "dist/index.js", "files": [ "dist" @@ -99,7 +99,7 @@ "@walmart/react-native-shared-navigation": "6.1.4", "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "3.7.0", - "@walmart/roster-mini-app": "2.12.41", + "@walmart/roster-mini-app": "2.12.42", "@walmart/ui-components": "1.15.1", "babel-jest": "^29.2.1", "chance": "^1.1.11", --- yarn.lock @@ -6416,7 +6416,7 @@ __metadata: "@walmart/react-native-shared-navigation": "npm:6.1.4" "@walmart/react-native-sumo-sdk": "npm:2.6.0" "@walmart/redux-store": "npm:3.7.0" - "@walmart/roster-mini-app": "npm:2.12.41" + "@walmart/roster-mini-app": "npm:2.12.42" "@walmart/ui-components": "npm:1.15.1" babel-jest: "npm:^29.2.1" chance: "npm:^1.1.11" @@ -6597,9 +6597,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:2.12.41": - version: 2.12.41 - resolution: "@walmart/roster-mini-app@npm:2.12.41" +"@walmart/roster-mini-app@npm:2.12.42": + version: 2.12.42 + resolution: "@walmart/roster-mini-app@npm:2.12.42" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6641,7 +6641,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/373bac0eb4f85316b84c5dae1a0417a4c56ea05ea5694fbb245cb00d9ba34c915ba219894cee5d9c6c95e1c2550e22e57bc7511660a9f3239e6793647556ec13 + checksum: 10c0/45f878ac94e7d23156c9b344578304ebc9ab633df90fb9f9c123dd163257f765d0ed52ca4f465faba4ce5ab35275020f0479ff3b4a242aff6c9af77cd715ad73 languageName: node linkType: hard
Update the roster mini app version
Update the roster mini app version
24afe8e2bd62706d748c7cdc15adcbd60810f920
--- ios/Podfile.lock @@ -935,7 +935,7 @@ SPEC CHECKSUMS: GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4 glog: 5337263514dd6f09803962437687240c5dc39aa4 GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342 - GoogleDataTransport: 5fffe35792f8b96ec8d6775f5eccd83c998d5a3b + GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940 GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 leveldb-library: 50c7b45cbd7bf543c81a468fe557a16ae3db8729 libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc @@ -944,7 +944,7 @@ SPEC CHECKSUMS: Permission-LocationWhenInUse: e09ae67e8db2b1eeefb35f18ca59848d0785de5b Permission-Notifications: 4325073de6e418cfbbdd8d296822c419d8ddc7ef PromisesObjC: 99b6f43f9e1044bd87a95a60beff28c2c44ddb72 - Protobuf: b60ec2f51ad74765f44d0c09d2e0579d7de21745 + Protobuf: 66e2f3b26a35e4cc379831f4ced538274ee4b923 PTT: dcd0a88856e88369871ca235c31639afecedd32b RCT-Folly: a21c126816d8025b547704b777a2ba552f3d9fa9 RCTRequired: 4bf86c70714490bca4bf2696148638284622644b --- package-lock.json @@ -4343,9 +4343,9 @@ "integrity": "sha512-qJaaKPSs5rNbukmidrZoqqWylzPX1nos0NwavGpgMjfCIvRuAE83yxNgNMV2KNP8y42YfNhEQlMJ5dCnsg/vWw==" }, "@walmart/push-to-talk-mini-app": { - "version": "0.5.117", - "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.5.117.tgz", - "integrity": "sha512-thSC4BAnDXS8r+aMYca94EtYwUftY/MPoJbIm0QPaC8u+mZUnk7lgRXTIjw3b+cP/uHTAQg/ooTPsozm1oU8Og==" + "version": "0.5.120", + "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.5.120.tgz", + "integrity": "sha512-8iD6QFjvOaz5nJ6InNe/ivF517KQcn9JjTrok8LmxgTqOFFqqq0IM/L8+HzHIcysNczGZI/8UCyF9EoxYQB8Uw==" }, "@walmart/react-native-collapsible": { "version": "1.5.3", --- package.json @@ -91,7 +91,7 @@ "@walmart/moment-walmart": "1.0.4", "@walmart/payrollsolution_miniapp": "0.101.0", "@walmart/price-changes-mini-app": "1.0.6", - "@walmart/push-to-talk-mini-app": "0.5.117", + "@walmart/push-to-talk-mini-app": "0.5.120", "@walmart/react-native-env": "^0.2.0", "@walmart/react-native-logger": "^1.28.0", "@walmart/react-native-shared-navigation": "^0.4.0",
updating ptt
updating ptt
4db8c281e33790b1dfcffdefe604dd8a94edb064
--- ios/AllSpark.xcodeproj/project.pbxproj @@ -26,7 +26,7 @@ F013541224ED83A80094D840 /* Bogle-RegularItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = F013540624ED83A70094D840 /* Bogle-RegularItalic.otf */; }; F013541324ED83A80094D840 /* Bogle-ThinItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = F013540724ED83A80094D840 /* Bogle-ThinItalic.otf */; }; F013541424ED83A80094D840 /* Bogle-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = F013540824ED83A80094D840 /* Bogle-Regular.otf */; }; - F07B5AC8251016B4000F11AB /* global-nav.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F07B5AC7251016B4000F11AB /* global-nav.ttf */; }; + F0C92FC4252E3D2F000B5582 /* icomoon.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F0C92FC3252E3D2F000B5582 /* icomoon.ttf */; }; F0F40C0D24DDA8F00001739F /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = F0F40C0C24DDA8F00001739F /* GoogleService-Info.plist */; }; /* End PBXBuildFile section */ @@ -72,7 +72,7 @@ F013540624ED83A70094D840 /* Bogle-RegularItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Bogle-RegularItalic.otf"; path = "AllSpark/Bogle-RegularItalic.otf"; sourceTree = "<group>"; }; F013540724ED83A80094D840 /* Bogle-ThinItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Bogle-ThinItalic.otf"; path = "AllSpark/Bogle-ThinItalic.otf"; sourceTree = "<group>"; }; F013540824ED83A80094D840 /* Bogle-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Bogle-Regular.otf"; path = "AllSpark/Bogle-Regular.otf"; sourceTree = "<group>"; }; - F07B5AC7251016B4000F11AB /* global-nav.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "global-nav.ttf"; path = "../android/app/src/main/assets/fonts/global-nav.ttf"; sourceTree = "<group>"; }; + F0C92FC3252E3D2F000B5582 /* icomoon.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = icomoon.ttf; sourceTree = "<group>"; }; F0F40C0B24DCA31B0001739F /* AllSpark.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = AllSpark.entitlements; path = AllSpark/AllSpark.entitlements; sourceTree = "<group>"; }; F0F40C0C24DDA8F00001739F /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; }; /* End PBXFileReference section */ @@ -117,7 +117,7 @@ 13B07FAE1A68108700A75B9A /* AllSpark */ = { isa = PBXGroup; children = ( - F07B5AC7251016B4000F11AB /* global-nav.ttf */, + F0C92FC3252E3D2F000B5582 /* icomoon.ttf */, F01353FC24ED83930094D840 /* New Group */, F0F40C0C24DDA8F00001739F /* GoogleService-Info.plist */, F0F40C0B24DCA31B0001739F /* AllSpark.entitlements */, @@ -317,9 +317,9 @@ F013540C24ED83A80094D840 /* Bogle-Bold.otf in Resources */, F013541024ED83A80094D840 /* Bogle-Medium.otf in Resources */, F013540E24ED83A80094D840 /* Bogle-BlackItalic.otf in Resources */, + F0C92FC4252E3D2F000B5582 /* icomoon.ttf in Resources */, F013541324ED83A80094D840 /* Bogle-ThinItalic.otf in Resources */, F013540924ED83A80094D840 /* Bogle-Thin.otf in Resources */, - F07B5AC8251016B4000F11AB /* global-nav.ttf in Resources */, F013541224ED83A80094D840 /* Bogle-RegularItalic.otf in Resources */, F0F40C0D24DDA8F00001739F /* GoogleService-Info.plist in Resources */, ); --- ios/AllSpark/Info.plist @@ -84,7 +84,7 @@ <string>Bogle-Black.otf</string> <string>MaterialIcons.ttf</string> <string>MaterialCommunityIcons.ttf</string> - <string>global-nav.ttf</string> + <string>icomoon.ttf</string> </array> <key>UIBackgroundModes</key> <array> --- ios/icomoon.ttf Binary files /dev/null and b/ios/icomoon.ttf differ
fix ios font file
fix ios font file
c099e4ab1526521d11e30218647233ca9704b34d
--- src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen.tsx @@ -52,6 +52,8 @@ import {AssociateListLoading} from '../../components/AssociateList/AssociateList import {AssociateListItem} from '../../components/AssociateList/AssociateListItem'; import {analytics} from '../../logger/analytics'; import moment from 'moment'; +import {useGetSupplyChainShifts} from '@walmart/allspark-foundation-hub/lib/SupplyChain/Hooks/useSupplyChainShifts'; + import {Alert, Body} from '@walmart/gtp-shared-components'; import { associateIsAbsent, @@ -101,6 +103,7 @@ export const SupplyChainRosterDetailScreen = ({ const showSearchInput = useSelector(displaySearchInput); const showTeamHub: boolean = useSelector(showManagerTeamsHub); const isManagerView = useUserCanSeeHub(); + const {allShifts} = useGetSupplyChainShifts(); const isSalariedOrLead = showTeamHub && isManagerView; const defaultTeamLabel = initialTeamName || TOTAL_SITE_TEAM_LABEL; const defaultTeamIds = initialTeamId ? [initialTeamId] : [TOTAL_SITE_TEAM_ID]; @@ -241,6 +244,9 @@ export const SupplyChainRosterDetailScreen = ({ teamRosterData: any, shiftNumber: any, ) { + if (shiftNumber.length === allShifts.length) { + return teamRosterData; + } return teamRosterData.filter((member: any) => shiftNumber.includes(member?.shift?.number), );
Adding all shift check
Adding all shift check
ae5de54405fc711dd58fa938a6bcca8bdb1aa464
--- targets/US/package.json @@ -89,7 +89,7 @@ "@walmart/attendance-mini-app": "3.96.0", "@walmart/avp-feature-app": "0.10.19", "@walmart/avp-shared-library": "0.10.5", - "@walmart/backroom-mini-app": "1.7.5", + "@walmart/backroom-mini-app": "1.8.7", "@walmart/calling-mini-app": "0.5.17", "@walmart/checkout-mini-app": "3.31.0", "@walmart/compass-sdk-rn": "5.19.15", --- yarn.lock @@ -6352,9 +6352,9 @@ __metadata: languageName: node linkType: hard -"@walmart/backroom-mini-app@npm:1.7.5": - version: 1.7.5 - resolution: "@walmart/backroom-mini-app@npm:1.7.5" +"@walmart/backroom-mini-app@npm:1.8.7": + version: 1.8.7 + resolution: "@walmart/backroom-mini-app@npm:1.8.7" dependencies: pubsub-js: "npm:^1.9.4" react-native-mask-input: "npm:^1.2.3" @@ -6377,7 +6377,7 @@ __metadata: react-native-svg-transformer: ">=1.0.0" react-redux: ^8.0.0 redux: ^4.0.0 - checksum: 10c0/ce9b49937299f8ec00576d37a22c8dca270f8efb986118cbade77967e11937f23b64e5dc5cef481252b94954e4c89c85d68b75ce25a634d106a0cdc62945a352 + checksum: 10c0/3a6bd45bf2cee69c2badc5d600b46c4142a926434c1c8b2bb416555c818c70e5de067ff32b67f4447de270464326d8696cb785261b4143ca42e5fe26c9cf6241 languageName: node linkType: hard @@ -7289,7 +7289,7 @@ __metadata: "@walmart/attendance-mini-app": "npm:3.96.0" "@walmart/avp-feature-app": "npm:0.10.19" "@walmart/avp-shared-library": "npm:0.10.5" - "@walmart/backroom-mini-app": "npm:1.7.5" + "@walmart/backroom-mini-app": "npm:1.8.7" "@walmart/calling-mini-app": "npm:0.5.17" "@walmart/checkout-mini-app": "npm:3.31.0" "@walmart/compass-sdk-rn": "npm:5.19.15"
Update @walmart/backroom-mini-app to 1.8.7
Update @walmart/backroom-mini-app to 1.8.7
45c90d536bb60b312e9c20e2d8fe672aac9228f3
--- src/screens/ChannelsScreen.tsx @@ -71,6 +71,7 @@ const renderChannel: ListRenderItem<string> = ({ }) => { return ( <ChannelRow + testID='channelRow' channelPath={channel} index={index} channelsListLength={extraData?.channelsListLength} @@ -85,6 +86,7 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = ( const {navigation, newMessageButtonOffset, isMeganavScreen} = props; const channels = useChannelContext(); const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); + const isConnected = useSelector(getNetworkState)?.isConnected; const userIsInRoster = useUserIsInRoster(); const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled); const userIsImpersonatedOnDev: boolean = useIsImpersonatedOnDev(); @@ -161,7 +163,9 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = ( renderItem={renderChannel} ItemSeparatorComponent={renderDivider} ListEmptyComponent={EmptyChannels} - ListHeaderComponent={channels?.isError && <ErrorComponent />} + ListHeaderComponent={ + (channels?.isError || !isConnected) && <ErrorComponent /> + } extraData={extraData} estimatedItemSize={100} contentContainerStyle={{ --- src/screens/ChannelsScreen.tsx @@ -71,6 +71,7 @@ const renderChannel: ListRenderItem<string> = ({ }) => { return ( <ChannelRow + testID='channelRow' channelPath={channel} index={index} channelsListLength={extraData?.channelsListLength} @@ -85,6 +86,7 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = ( const {navigation, newMessageButtonOffset, isMeganavScreen} = props; const channels = useChannelContext(); const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); + const isConnected = useSelector(getNetworkState)?.isConnected; const userIsInRoster = useUserIsInRoster(); const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled); const userIsImpersonatedOnDev: boolean = useIsImpersonatedOnDev(); @@ -161,7 +163,9 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = ( renderItem={renderChannel} ItemSeparatorComponent={renderDivider} ListEmptyComponent={EmptyChannels} - ListHeaderComponent={channels?.isError && <ErrorComponent />} + ListHeaderComponent={ + (channels?.isError || !isConnected) && <ErrorComponent /> + } extraData={extraData} estimatedItemSize={100} contentContainerStyle={{
revert changes to channels screen page
revert changes to channels screen page
b644e86e9a080389fc0d4cb0004c769cbce8e363
--- .looper-pr.yml @@ -1,5 +1,22 @@ inherit: job:///allspark/allspark-miniapp-cicd-templates:allspark-miniapp-cicd-template.yml +tools: + jdk: + flavor: azul + version: 17 + +flows: + npm-install: + - (name Enable Corepack) corepack enable + - (name Yarn Set Version) yarn set version 4.1.1 + - (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: --- .looper.yml @@ -1,24 +1,25 @@ -tools: - nodejs: 16.17.0 - sonarscanner: 3.0.3.778 +inherit: 'job:///metropolis/metroloop/metroloop-parent' -triggers: - - manual: - name: Publish - call: default +tools: + nodejs: 20.10.0 + jdk: + flavor: azul + version: 17 flows: default: - call: pr - - npm run build - - npm publish + - yarn run build + - yarn publish - sonar("Sonar"): - (name Sonar Scanner) sonar-scanner -Dproject.settings=sonar-project.properties - (name Publish Hygieia to Sonar) hygieia.publishSonar() - (name Hygieia Publish Build) hygieia.publishBuild() pr: - - npm install - - npm run lint - - npm run build - - npm run coverage + - (name Corepack enable) corepack enable + - (name Yarn Set Version) yarn set version 4.1.1 + - (name Yarn Version) yarn --version + - yarn install + - yarn run lint + - yarn run coverage \ No newline at end of file --- package.json @@ -14,7 +14,7 @@ "lint": "eslint . --ext .js,.jsx,.ts,.tsx", "lint:fix": "eslint ./src ./__tests__ --ext .js,.jsx,.ts,.tsx --fix", "copy:images": "cp -r ./src/images ./dist/", - "build": "npm config fix && rm -rf ./dist && tsc && npm run copy:images", + "build": "rm -rf ./dist && tsc && yarn run copy:images", "env:dev": "cp ./container/env.dev.ts ./container/env.ts", "env:teflon": "cp ./container/env.teflon.ts ./container/env.ts", "env:beta": "cp ./container/env.beta.ts ./container/env.ts", @@ -91,7 +91,6 @@ "jest": "^29.2.1", "metro-react-native-babel-preset": "0.76.5", "namecase": "^1.1.2", - "npm": "^9.6.4", "patch-package": "^6.5.0", "prettier": "^2.4.1", "promise": "^8.3.0",
Update foundation packages
Update foundation packages
427d726267b2c79e32723ce63490ac5f50c6f764
--- package-lock.json @@ -39,7 +39,7 @@ "@walmart/allspark-neon-core": "0.1.31", "@walmart/amp-mini-app": "1.1.58", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.15.2", + "@walmart/ask-sam-mini-app": "1.15.4", "@walmart/attendance-mini-app": "0.190.6", "@walmart/compass-sdk-rn": "4.2.0", "@walmart/config-components": "4.2.5", @@ -48,7 +48,7 @@ "@walmart/core-services-allspark": "~2.12.6", "@walmart/core-utils": "~2.0.5", "@walmart/core-widget-registry": "~1.2.4", - "@walmart/counts-component-miniapp": "0.1.5", + "@walmart/counts-component-miniapp": "0.1.6", "@walmart/emergency-mini-app": "1.26.1", "@walmart/exception-mini-app": "1.5.1", "@walmart/facilities-management-miniapp": "0.6.67", @@ -7941,9 +7941,9 @@ } }, "node_modules/@walmart/ask-sam-mini-app": { - "version": "1.15.2", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.15.2.tgz", - "integrity": "sha512-RqiZrptz3qwL+pJijTuZgT05Ut1xZCN23GJzruyENqx4vcP1Pf45nvjd2c3RJVDNgyVo5S4ugXrtnxPze+r+Rw==", + "version": "1.15.4", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.15.4.tgz", + "integrity": "sha512-6daTOiAv5yCfwB9Kj/h8ECePMulH/KhKPm7yoMoQBeVOZ30/2K5FK0jeL49Aq/0/wtvTFCzpAMnfiGokH9tWmg==", "license": "NONE", "dependencies": { "apisauce": "^1.1.2", @@ -8215,7 +8215,9 @@ } }, "node_modules/@walmart/counts-component-miniapp": { - "version": "0.1.5", + "version": "0.1.6", + "resolved": "https://npme.walmart.com/@walmart/counts-component-miniapp/-/counts-component-miniapp-0.1.6.tgz", + "integrity": "sha512-WRW2jpb7pJJ423n8Vlzq2rKg68Rd4fSIvQ7mcIzwXnoOzdoZRoxkKTCYhLbjQW+biRORThwrQpbDixGQF6wj4g==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -33510,9 +33512,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "1.15.2", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.15.2.tgz", - "integrity": "sha512-RqiZrptz3qwL+pJijTuZgT05Ut1xZCN23GJzruyENqx4vcP1Pf45nvjd2c3RJVDNgyVo5S4ugXrtnxPze+r+Rw==", + "version": "1.15.4", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.15.4.tgz", + "integrity": "sha512-6daTOiAv5yCfwB9Kj/h8ECePMulH/KhKPm7yoMoQBeVOZ30/2K5FK0jeL49Aq/0/wtvTFCzpAMnfiGokH9tWmg==", "requires": { "apisauce": "^1.1.2", "axios-cache-adapter": "^2.7.3", @@ -33627,7 +33629,9 @@ } }, "@walmart/counts-component-miniapp": { - "version": "0.1.5" + "version": "0.1.6", + "resolved": "https://npme.walmart.com/@walmart/counts-component-miniapp/-/counts-component-miniapp-0.1.6.tgz", + "integrity": "sha512-WRW2jpb7pJJ423n8Vlzq2rKg68Rd4fSIvQ7mcIzwXnoOzdoZRoxkKTCYhLbjQW+biRORThwrQpbDixGQF6wj4g==" }, "@walmart/emergency-mini-app": { "version": "1.26.1", --- package.json @@ -89,7 +89,7 @@ "@walmart/core-services-allspark": "~2.12.6", "@walmart/core-utils": "~2.0.5", "@walmart/core-widget-registry": "~1.2.4", - "@walmart/counts-component-miniapp": "0.1.5", + "@walmart/counts-component-miniapp": "0.1.6", "@walmart/emergency-mini-app": "1.26.1", "@walmart/exception-mini-app": "1.5.1", "@walmart/facilities-management-miniapp": "0.6.67",
Bump counts mini app
Bump counts mini app
0bf31a524cd9e3e93296b18578f2a88febc2594e
--- src/screens/ChannelsScreen.tsx @@ -77,6 +77,7 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = ( const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled); const userIsImpersonatedOnDev: boolean = useIsImpersonatedOnDev(); const currentUserSite: string = useSelector(UserSelectors.getUserSite); + const channelTopMargin = !isMeganavScreen ? 16 : 0; const onNewMessage = () => { navigation.navigate(ROOT_CONTAINER_SCREEN_NAME, { @@ -141,7 +142,7 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = ( } extraData={extraData} estimatedItemSize={100} - contentInset={{bottom: bottomInset}} + contentInset={{bottom: bottomInset, top: channelTopMargin}} /> ) : ( <TextingDisabledScreen --- src/screens/ChannelsScreen.tsx @@ -77,6 +77,7 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = ( const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled); const userIsImpersonatedOnDev: boolean = useIsImpersonatedOnDev(); const currentUserSite: string = useSelector(UserSelectors.getUserSite); + const channelTopMargin = !isMeganavScreen ? 16 : 0; const onNewMessage = () => { navigation.navigate(ROOT_CONTAINER_SCREEN_NAME, { @@ -141,7 +142,7 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = ( } extraData={extraData} estimatedItemSize={100} - contentInset={{bottom: bottomInset}} + contentInset={{bottom: bottomInset, top: channelTopMargin}} /> ) : ( <TextingDisabledScreen
update top margin for channel screen
update top margin for channel screen
62943559a75e1186a9c6d7b42780bc5790cb3a2f
--- packages/me-at-walmart-container/__tests__/services/user/getAssociatesInfo.test.ts @@ -152,92 +152,4 @@ describe('getAssociateInfo', () => { expect(result).toEqual(cachedUser); }); - - afterEach(() => { - jest.clearAllMocks(); - }); -}); - -/* -describe('getAssociateInfo', () => { - const tokenData = { - scope: 'openid full', - client_id: 'Connected-Associate', - guid: 'rBfyTLalJ7EEZJGCE4ZWjez8YPzfXFiB', - iss: 'https://pfedcert.wal-mart.com', - jti: '2Z50wGWU', - sub: 'NOT_FOUND', - c: '', - userid: '', - aud: '', - upn: 'vn57guq@homeoffice.wal-mart.com', - nbf: 1736975385, - iat: 1736975505, - win: '', - exp: 1736976405, - }; - const tokenUser = {userId: '123'}; - const cachedUser = {userId: '123'}; - const user = {userId: '123'}; - const error = new Error('GraphQL error'); - - beforeEach(() => { - (tokenDataToUser as jest.Mock).mockReturnValue(tokenUser); - }); - - it('should return cached user if available', async () => { - (getCachedUser as jest.Mock).mockResolvedValue(cachedUser); - - const result = await getAssociateInfo(tokenData); - - expect(result).toEqual(cachedUser); - }); - - it('should fetch user from GraphQL and cache if successful', async () => { - (getCachedUser as jest.Mock).mockResolvedValue(null); - MeAtWalmartEnvironment.getDeferred.mockResolvedValue({ - http: {consumerId: 'consumer-id'}, - }); - (AllsparkGraphQLClient.query as jest.Mock).mockResolvedValue({ - data: {getLoggedInUser: tokenUser}, - error: null, - }); - (parseUserResponse as jest.Mock).mockReturnValue(user); - - const result = await getAssociateInfo(tokenData); - - expect(result).toEqual(user); - }); - - it('should return tokenUser if GraphQL returns null', async () => { - (getCachedUser as jest.Mock).mockResolvedValue(null); - MeAtWalmartEnvironment.getDeferred.mockResolvedValue({ - http: {consumerId: 'consumer-id'}, - }); - ( AllsparkGraphQLClient.query as jest.Mock).mockResolvedValue({ - data: {getLoggedInUser: null}, - error: null, - }); - - const result = await getAssociateInfo(tokenData); - - expect(result).toEqual(tokenUser); - }); - - it('should handle GraphQL error and fallback to cache or token', async () => { - (getCachedUserRaw as jest.Mock).mockResolvedValue(cachedUser); - (getCachedUser as jest.Mock).mockResolvedValue(null); - MeAtWalmartEnvironment.getDeferred.mockResolvedValue({ - http: {consumerId: 'consumer-id'}, - }); - (AllsparkGraphQLClient.query as jest.Mock).mockRejectedValue(error); - - const result = await getAssociateInfo(tokenData); - - expect(result).toEqual(cachedUser); - }); - - afterEach(() => { - jest.clearAllMocks(); - }); -}); */ +}); \ No newline at end of file
clean up
clean up
ca3382d9f2fa8857dee515b7f8899f0422a8da1a
--- package.json @@ -88,7 +88,7 @@ "@walmart/manager-approvals-miniapp": "0.0.58", "@walmart/metrics-mini-app": "0.4.14", "@walmart/moment-walmart": "1.0.4", - "@walmart/payrollsolution_miniapp": "^0.73.0", + "@walmart/payrollsolution_miniapp": "^0.79.0", "@walmart/push-to-talk-mini-app": "0.5.39", "@walmart/react-native-env": "^0.2.0", "@walmart/react-native-logger": "^1.28.0",
chore(welecomeMe): version update on payroll to 0.79.0
chore(welecomeMe): version update on payroll to 0.79.0
f4233b335d6f33f671c5d6f9878bc9f32a670f19
--- src/components/hoc/README.md @@ -66,35 +66,37 @@ const ProductionOnlyWidget = withCCMFlag(MyWidget, { }); ``` -## Pre-configured HOCs +## Factory Function for Common Patterns -Use convenient shortcuts for common CCM flags: +Use the `createCCMFlagHOC` factory function for creating reusable HOCs for specific flags: ```typescript -import {CCMFlagHOCs} from '../components/hoc/withCCMFlag'; - -// Pre-configured HOCs for common patterns -const ConditionalCelebrationWidget = - CCMFlagHOCs.withCelebrationWidget(CelebrationWidget); -const ConditionalRosterWidget = CCMFlagHOCs.withRosterWidget(RosterWidget); -const ConditionalTeamSwitcher = - CCMFlagHOCs.withTeamSwitcher(TeamSwitcherButton); -const ConditionalAnalytics = CCMFlagHOCs.withAnalytics(AnalyticsPanel); +import {createCCMFlagHOC} from '../components/hoc/withCCMFlag'; + +// Create reusable HOC factories for common flags +const withCelebrationWidget = createCCMFlagHOC('showCelebrationWidget'); +const withRosterWidget = createCCMFlagHOC('showRosterWidget'); +const withAnalytics = createCCMFlagHOC('showAnalytics'); + +// Apply to multiple components +const ConditionalCelebrationWidget = withCelebrationWidget(CelebrationWidget); +const ConditionalRosterWidget = withRosterWidget(RosterWidget); +const ConditionalAnalyticsPanel = withAnalytics(AnalyticsPanel); ``` -### Available Pre-configured HOCs +### Available CCM Flags -| HOC | Flag Key | Description | -| ----------------------- | ----------------------- | ---------------------------------- | -| `withCelebrationWidget` | `showCelebrationWidget` | For celebration-related components | -| `withRosterWidget` | `showRosterWidget` | For team roster components | -| `withTeamSwitcher` | `enableTeamSwitcher` | For team switching functionality | -| `withTeamSelection` | `showTeamSelection` | For team selection interfaces | -| `withUserProfile` | `showUserProfile` | For user profile components | -| `withNotifications` | `showNotifications` | For notification components | -| `withDashboard` | `showDashboard` | For dashboard components | -| `withAnalytics` | `showAnalytics` | For analytics components | -| `withDebugMode` | `enableDebugMode` | For debug-only components | +| Flag Key | Description | +| ----------------------- | ---------------------------------- | +| `showCelebrationWidget` | For celebration-related components | +| `showRosterWidget` | For team roster components | +| `enableTeamSwitcher` | For team switching functionality | +| `showTeamSwitcher` | For team selection interfaces | +| `showUserProfile` | For user profile components | +| `showNotifications` | For notification components | +| `showDashboard` | For dashboard components | +| `showAnalytics` | For analytics components | +| `enableDebugMode` | For debug-only components | ## Advanced Usage @@ -116,8 +118,9 @@ const ConditionalReports = withAnalyticsFlag(ReportsComponent); ```typescript // Combine multiple conditions +const withDashboard = createCCMFlagHOC('showDashboard'); let MyComponent = BaseComponent; -MyComponent = CCMFlagHOCs.withDashboard(MyComponent); +MyComponent = withDashboard(MyComponent); MyComponent = withCCMFlag(MyComponent, { flagKey: 'showAnalytics', }); @@ -277,10 +280,11 @@ The HOC integrates with the existing CCM (Configuration Management) system: ### 1. Use Pre-configured HOCs When Available ```typescript -// ✅ Good - Use pre-configured HOC -const ConditionalWidget = CCMFlagHOCs.withCelebrationWidget(MyWidget); +// ✅ Good - Use factory function for reusable patterns +const withCelebrationWidget = createCCMFlagHOC('showCelebrationWidget'); +const ConditionalWidget = withCelebrationWidget(MyWidget); -// ❌ Avoid - Manual HOC when pre-configured exists +// ❌ Avoid - Manual HOC when reusable pattern would be better const ConditionalWidget = withCCMFlag(MyWidget, { flagKey: 'showCelebrationWidget', }); @@ -318,7 +322,8 @@ const ConditionalModal = withCCMFlag(Modal, {flagKey: 'enableNewFeature'}); ```typescript // ✅ Good - HOC handles conditional logic -const ConditionalAnalytics = CCMFlagHOCs.withAnalytics(AnalyticsWidget); +const withAnalytics = createCCMFlagHOC('showAnalytics'); +const ConditionalAnalytics = withAnalytics(AnalyticsWidget); // ❌ Avoid - Manual conditional logic in component const AnalyticsContainer = () => { @@ -367,9 +372,10 @@ const MyComponent = () => { **After:** ```typescript -const ConditionalCelebrationWidget = - CCMFlagHOCs.withCelebrationWidget(CelebrationWidget); -const ConditionalRosterWidget = CCMFlagHOCs.withRosterWidget(RosterWidget); +const withCelebrationWidget = createCCMFlagHOC('showCelebrationWidget'); +const withRosterWidget = createCCMFlagHOC('showRosterWidget'); +const ConditionalCelebrationWidget = withCelebrationWidget(CelebrationWidget); +const ConditionalRosterWidget = withRosterWidget(RosterWidget); const MyComponent = () => ( <div> --- src/components/modals/hoc/UpdateModal.tsx @@ -162,7 +162,14 @@ const UpdateModal = AssociateExpHubFeature.createModal( !selectedSavedTeamItem && (!hasAnyPreferences || !primaryTeamExists) ) { - console.log('Initializing with primary team:', primaryTeamId); + AssociateExpHubLogger.info( + 'UpdateModal: Initializing with primary team', + { + primaryTeamId, + hasAnyPreferences, + primaryTeamExists, + } + ); // Update Redux state dispatch( @@ -381,7 +388,7 @@ const UpdateModal = AssociateExpHubFeature.createModal( } else { await handleUpsert(); } - }, [enableUpdateModalUpsert, selectedShifts, handleUpsert]); + }, [enableUpdateModalUpsert, selectedShifts, handleUpsert, isSiteDC]); const onApplyButtonPress = useCallback(() => { if (!enableUpdateModalUpsert) { @@ -397,7 +404,12 @@ const UpdateModal = AssociateExpHubFeature.createModal( } else { return isSiteDC ? handleDCApplyButton() : handleCloseModal(); } - }, [enableUpdateModalUpsert, isSiteDC, handleDCApplyButton]); + }, [ + enableUpdateModalUpsert, + isSiteDC, + handleDCApplyButton, + preferences.length, + ]); const shiftsConfig = useMemo( () => ({
feat(ui): code cleanup #SMDV-8174
feat(ui): code cleanup #SMDV-8174
17ba3f2f1a5c0b8039a44679f22778abf635a848
--- package-lock.json @@ -5442,9 +5442,9 @@ } }, "@walmart/price-changes-mini-app": { - "version": "1.5.4-alpha", - "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.5.4-alpha.tgz", - "integrity": "sha512-Qvxqr8VYrG4Hcad76gzu86ngkD6C0d3/Iu538r/mcxBDHCt0GS2kisV0mXF+rTlTpKEnW5mYLBqe44bmXFpswA==" + "version": "1.5.5", + "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.5.5.tgz", + "integrity": "sha512-uk83daFcpMYwrKAgfQrkgW74m91NUIq1MiHmZCZVzWD8d1cSFi/MI/h/rgNLwiIPCvX4YuDF/hxQvNL1sFS0XQ==" }, "@walmart/profile-feature-app": { "version": "0.0.71", --- package.json @@ -104,7 +104,7 @@ "@walmart/moment-walmart": "1.0.4", "@walmart/pay-stub-miniapp": "0.8.6", "@walmart/payrollsolution_miniapp": "0.127.5", - "@walmart/price-changes-mini-app": "1.5.4", + "@walmart/price-changes-mini-app": "1.5.5", "@walmart/profile-feature-app": "0.0.71", "@walmart/push-to-talk-mini-app": "1.8.14", "@walmart/react-native-encrypted-storage": "1.1.3",
Bump price changes to 1.5.5
Bump price changes to 1.5.5
0cef89ce2e7badd30d68d8175c56ca1e88cebf40
--- targets/US/package.json @@ -149,7 +149,7 @@ "@walmart/store-feature-orders": "1.27.1", "@walmart/taskit-mini-app": "4.25.8", "@walmart/time-clock-mini-app": "2.448.1", - "@walmart/time-clock-mini-app-next": "2.808.0", + "@walmart/time-clock-mini-app-next": "2.809.0", "@walmart/topstock-mini-app": "1.19.4", "@walmart/translator-mini-app": "1.3.7", "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.18.7#~/.yarn/patches/@walmart-ui-components-npm-1.18.7-9e23294b76.patch", --- yarn.lock @@ -7371,7 +7371,7 @@ __metadata: "@walmart/store-feature-orders": "npm:1.27.1" "@walmart/taskit-mini-app": "npm:4.25.8" "@walmart/time-clock-mini-app": "npm:2.448.1" - "@walmart/time-clock-mini-app-next": "npm:2.808.0" + "@walmart/time-clock-mini-app-next": "npm:2.809.0" "@walmart/topstock-mini-app": "npm:1.19.4" "@walmart/translator-mini-app": "npm:1.3.7" "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.18.7#~/.yarn/patches/@walmart-ui-components-npm-1.18.7-9e23294b76.patch" @@ -8361,9 +8361,9 @@ __metadata: languageName: node linkType: hard -"@walmart/time-clock-mini-app-next@npm:2.808.0": - version: 2.808.0 - resolution: "@walmart/time-clock-mini-app-next@npm:2.808.0" +"@walmart/time-clock-mini-app-next@npm:2.809.0": + version: 2.809.0 + resolution: "@walmart/time-clock-mini-app-next@npm:2.809.0" dependencies: "@react-navigation/elements": "npm:^1.3.1" moment-timezone: "npm:0.5.33" @@ -8409,7 +8409,7 @@ __metadata: uuid: ^3.3.2 wifi-store-locator: ^1.4.0 xdate: ^0.8.2 - checksum: 10c0/26060a8ad6fbdd3f25c75e4d953b54fc631e83dfb75563b02de3afb2c47ff5bcf73e4d7e0f74251f7a74d9b73a1f7e9190ec851ca3a0fa62cd82486d865034cc + checksum: 10c0/d1e1975d54dbb58e725d1a90703eda2899246bb8a3c2e0ede7c45c0a6c11a4c4542be5ac6ae24a9cfba24f0bc399a9c36caa4c239c07eec01da2a6ed49d6145f languageName: node linkType: hard
chore: update time clock next version
chore: update time clock next version
f0759e9150119694a392b6bce7d5cc77affcfe59
--- src/navigation/Inbox.tsx @@ -12,19 +12,40 @@ import { ShiftSwapWidget, } from '@walmart/schedule-mini-app'; +enum INBOX_WIDGET_NAME { + AMP = 'amp', + LEARNING_NOTIFICATION_WIDGET = 'LearningNotificationWidget', + ONE_WALMART_BANNER = 'OneWalmartBanner', + FEEDBACK_SURVEY = 'feedbackSurvey', + DEFAULT_NOTIFICATION_TILE = 'DefaultNotificationTile', + EMERGENCY_NOTIFICATION_WIDGET = 'EmergencyNotificationWidget', + SSR_ACCEPT = 'ssrAccept', + SSR_PENDING = 'ssrPending', + SSR_DENY = 'ssrDeny', + TOR_WIDGET = 'torWidget', + SCHED_MOD = 'schedMod', + SSR_CLOSE = 'ssrClose', +} + export const registerInboxComponents = () => { InboxWidgetRegistry.multiRegister([ - ['amp', AmpMessageCard], - ['LearningNotificationWidget', LearningNotificationWidget], - ['OneWalmartBanner', OneWalmartBanner], - ['feedbackSurvey', SurveySaysInboxCard], - ['DefaultNotificationTile', DefaultNotificationTile], - ['EmergencyNotificationWidget', EmergencyNotificationWidget], - ['ssrAccept', SwapResponseCard], - ['ssrPending', ShiftSwapWidget], - ['ssrDeny', SwapResponseCard], - ['torWidget', TorInboxWidget], - ['schedMod', ScheduleModCard], - ['ssrClose', SwapResponseCard], + [INBOX_WIDGET_NAME.AMP, AmpMessageCard], + [ + INBOX_WIDGET_NAME.LEARNING_NOTIFICATION_WIDGET, + LearningNotificationWidget, + ], + [INBOX_WIDGET_NAME.ONE_WALMART_BANNER, OneWalmartBanner], + [INBOX_WIDGET_NAME.FEEDBACK_SURVEY, SurveySaysInboxCard], + [INBOX_WIDGET_NAME.DEFAULT_NOTIFICATION_TILE, DefaultNotificationTile], + [ + INBOX_WIDGET_NAME.EMERGENCY_NOTIFICATION_WIDGET, + EmergencyNotificationWidget, + ], + [INBOX_WIDGET_NAME.SSR_ACCEPT, SwapResponseCard], + [INBOX_WIDGET_NAME.SSR_PENDING, ShiftSwapWidget], + [INBOX_WIDGET_NAME.SSR_DENY, SwapResponseCard], + [INBOX_WIDGET_NAME.TOR_WIDGET, TorInboxWidget], + [INBOX_WIDGET_NAME.SCHED_MOD, ScheduleModCard], + [INBOX_WIDGET_NAME.SSR_CLOSE, SwapResponseCard], ]); };
removing hardcoded values
removing hardcoded values
affd6e8ecfb272b09b09eaeb6817d23ff554abd5
--- package.json @@ -91,7 +91,7 @@ "@walmart/avp-shared-library": "0.5.2", "@walmart/backroom-mini-app": "1.1.9", "@walmart/calling-mini-app": "0.2.38", - "@walmart/checkout-mini-app": " 3.15.39", + "@walmart/checkout-mini-app": " 3.16.3", "@walmart/compass-sdk-rn": "5.19.8", "@walmart/config-components": "4.4.1", "@walmart/copilot-mini-app": "3.92.14", --- yarn.lock @@ -5817,9 +5817,9 @@ __metadata: languageName: node linkType: hard -"@walmart/checkout-mini-app@npm: 3.15.39": - version: 3.15.39 - resolution: "@walmart/checkout-mini-app@npm:3.15.39" +"@walmart/checkout-mini-app@npm: 3.16.3": + version: 3.16.3 + resolution: "@walmart/checkout-mini-app@npm:3.16.3" dependencies: "@stomp/stompjs": "npm:^7.0.0" cpc-input: "npm:^1.7.28" @@ -5855,7 +5855,7 @@ __metadata: react-native-wm-telemetry: ^0.3.0 react-redux: ^7.2.1 redux: ^4.0.5 - checksum: 10c0/a372bce7f7a8d07e2e4dd55f16de707aba473aef11d24a43e04e1ea19b3cf9ff40306ade0ec0f6341029c1d72b67568abb887f47099fde0b25a61f22cc291955 + checksum: 10c0/45980c83eec4b5100e03755e7bbc98e5d0dd553931c8e4e315cf4a6b07bdbb7088620575644e1bd3933b84df604c6cfce138be7b7a946a2c15cd710466310aca languageName: node linkType: hard @@ -7806,7 +7806,7 @@ __metadata: "@walmart/avp-shared-library": "npm:0.5.2" "@walmart/backroom-mini-app": "npm:1.1.9" "@walmart/calling-mini-app": "npm:0.2.38" - "@walmart/checkout-mini-app": "npm: 3.15.39" + "@walmart/checkout-mini-app": "npm: 3.16.3" "@walmart/compass-sdk-rn": "npm:5.19.8" "@walmart/config-components": "npm:4.4.1" "@walmart/copilot-mini-app": "npm:3.92.14"
Drop 22 changes
Drop 22 changes
a541f6eb73703a4428af8be0fbf307bd6e1fee86
--- package.json @@ -149,7 +149,7 @@ "@walmart/shelfavailability-mini-app": "1.5.41", "@walmart/shop-gnfr-mini-app": "1.0.302", "@walmart/sidekick-mini-app": "4.175.31", - "@walmart/store-feature-orders": "1.28.3", + "@walmart/store-feature-orders": "1.29.5", "@walmart/taskit-mini-app": "5.31.6", "@walmart/time-clock-mini-app": "2.462.1", "@walmart/time-clock-mini-app-next": "2.812.1", --- yarn.lock @@ -8382,7 +8382,7 @@ __metadata: "@walmart/shelfavailability-mini-app": "npm:1.5.41" "@walmart/shop-gnfr-mini-app": "npm:1.0.302" "@walmart/sidekick-mini-app": "npm:4.175.31" - "@walmart/store-feature-orders": "npm:1.28.3" + "@walmart/store-feature-orders": "npm:1.29.5" "@walmart/taskit-mini-app": "npm:5.31.6" "@walmart/time-clock-mini-app": "npm:2.462.1" "@walmart/time-clock-mini-app-next": "npm:2.812.1" @@ -9260,9 +9260,9 @@ __metadata: languageName: node linkType: hard -"@walmart/store-feature-orders@npm:1.28.3": - version: 1.28.3 - resolution: "@walmart/store-feature-orders@npm:1.28.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fstore-feature-orders%2F-%2F%40walmart%2Fstore-feature-orders-1.28.3.tgz" +"@walmart/store-feature-orders@npm:1.29.5": + version: 1.29.5 + resolution: "@walmart/store-feature-orders@npm:1.29.5::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fstore-feature-orders%2F-%2F%40walmart%2Fstore-feature-orders-1.29.5.tgz" peerDependencies: "@react-navigation/native": ">=6.0.0" "@react-navigation/stack": ">=6.1.0" @@ -9276,7 +9276,7 @@ __metadata: react-native: ">=0.73.7" redux: ^4.2.1 reduxsauce: 1.2.0 - checksum: 10c0/bc1c94cdda902b26a3d426d13a75970d2689e7cc26ec6661fad8832d14abb84e99a5e8e239647762af66ac977f0e87ee797345242143792a5d64f761f8da7a9b + checksum: 10c0/a92f567d78fb90b87181141e03b800314005e1c71291bcce80e4375d7b37f91bdb67903272abcd1a62cc27be78cd69921db3cfdcd2bef7e4236dd4141c2317eb languageName: node linkType: hard
feat(SFOT): OPIF-144690 Planned feature visibility and enhancements order Pg (#4183)
feat(SFOT): OPIF-144690 Planned feature visibility and enhancements order Pg (#4183) * feat: OPIF-144690 Planned feature visibility and enchancements order Pg * fix: FSS-7920 reverting hourl test * chore: OPIF-144690 revert the mdflex version --------- Co-authored-by: Pavan Lingamallu - p0l04ug <Pavan.Lingamallu@walmart.com>
131edaaa6398fe8d40f750dcf2e086330d58b0e4
--- __tests__/setup.ts @@ -53,13 +53,18 @@ jest.mock('@walmart/roster-mini-app', () => jest.mock('expo-image', () => jest.requireActual('expo-image')); -jest.mock('@walmart/allspark-foundation-hub/HubFeature/Store', () => ({ - ...jest.doMock('@walmart/allspark-foundation-hub/HubFeature/Store'), - AllsparkHubContainer: jest.fn().mockImplementationOnce(() => ({ - create: jest.fn().mockImplementationOnce(() => ({ - validate: jest.fn().mockImplementationOnce(() => ({ - render: jest.fn().mockImplementationOnce(() => {}), +jest.mock( + '@walmart/allspark-foundation-hub/HubFeature/AllsparkHubContainer', + () => ({ + ...jest.doMock( + '@walmart/allspark-foundation-hub/HubFeature/AllsparkHubContainer', + ), + AllsparkHubContainer: jest.fn().mockImplementationOnce(() => ({ + create: jest.fn().mockImplementationOnce(() => ({ + validate: jest.fn().mockImplementationOnce(() => ({ + render: jest.fn().mockImplementationOnce(() => {}), + })), })), })), - })), -})); + }), +); --- package.json @@ -99,7 +99,7 @@ "@walmart/react-native-shared-navigation": "6.1.4", "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "3.7.0", - "@walmart/roster-mini-app": "2.12.12", + "@walmart/roster-mini-app": "2.12.13", "@walmart/ui-components": "1.15.1", "babel-jest": "^29.2.1", "chance": "^1.1.11", --- src/components/TeamHubHeader.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import {HubHeader} from '@walmart/allspark-foundation-hub/HubFeature/Store'; +import {HubHeader} from '@walmart/allspark-foundation-hub'; import {translationClient} from '../common/translation'; export const TeamHubHeader = () => { --- src/navigation/index.tsx @@ -7,7 +7,7 @@ import { TEAM_HUB_KEY, TEAM_HUB_SCREEN_NAME, DEFAULT_WIDGET_IDS, -} from '@walmart/allspark-foundation-hub/HubFeature/Store'; +} from '@walmart/allspark-foundation-hub'; import {RosterMiniApp} from '@walmart/roster-mini-app'; import {WarningBanner} from '../components/WarningBanner'; import {useUserCanSeeTeamHub} from '../hooks/user'; --- yarn.lock @@ -6473,7 +6473,7 @@ __metadata: "@walmart/react-native-shared-navigation": "npm:6.1.4" "@walmart/react-native-sumo-sdk": "npm:2.6.0" "@walmart/redux-store": "npm:3.7.0" - "@walmart/roster-mini-app": "npm:2.12.12" + "@walmart/roster-mini-app": "npm:2.12.13" "@walmart/ui-components": "npm:1.15.1" babel-jest: "npm:^29.2.1" chance: "npm:^1.1.11" @@ -6654,9 +6654,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:2.12.12": - version: 2.12.12 - resolution: "@walmart/roster-mini-app@npm:2.12.12" +"@walmart/roster-mini-app@npm:2.12.13": + version: 2.12.13 + resolution: "@walmart/roster-mini-app@npm:2.12.13" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6698,7 +6698,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/ad1062a21ddf131da376bbc4134458e68728a7fb31e4e794feea42442958b92285b04f8831bfdc260369dd878568a91e6e08da87fcd4d41b40e8159a6656f18d + checksum: 10c0/3c52bdff6d16f0d830fda60520adfb24d6e630fca85122c21299c4c0c2e4528abd5c9fcd280428493dcfa40770a0d7f1fdd10590a1f6c26d392d0458409f6c51 languageName: node linkType: hard
Update the roster version
Update the roster version
3db244b8b53a887d546efc83fadd0a3658db919d
--- src/hooks/user.ts @@ -1,6 +1,25 @@ import {useSelector} from 'react-redux'; +import {isNil} from 'lodash'; +import {logger} from '../common/logger'; +import {UserSelectors} from '@walmart/allspark-foundation/User'; import {SiteSelectors} from '@walmart/allspark-foundation/Site'; +export const useUserIsInRoster = () => { + const workingSite = useSelector(UserSelectors.getWorkingSite); + const homeSite = useSelector(UserSelectors.getHomeSite); + try { + if (isNil(workingSite) || isNil(homeSite)) { + return false; + } + + return workingSite.toString() === homeSite.toString(); + } catch (error) { + logger.error('useUserIsInRoster error', { + message: `error in fetching useUserIsInRoster: ${error}`, + }); + } +}; + export const useSiteTranslationContext = () => { const isSiteDC = useSelector(SiteSelectors.getWorkingSiteIsDC); return isSiteDC ? 'site' : 'store';
feat: added back user is in roster util
feat: added back user is in roster util
a2b23923273f8f2a370e8ec1a7cdd3ee3f52d965
--- packages/allspark-foundation-hub/__tests__/utils/index.js @@ -0,0 +1,24 @@ +import React from 'react'; +import { Provider } from 'react-redux'; +import { render as tlRender } from '@testing-library/react-native'; +import { AllsparkReduxStore } from '@walmart/allspark-foundation/Redux'; +import { MockedProvider } from '@apollo/client/testing'; +const { apolloMocks } = require('../../__mocks__/data/apolloMocks'); + +const render = (component, renderOptions = {}) => { + const Wrapper = ({ children }) => { + return ( + <Provider store={AllsparkReduxStore}> + <MockedProvider mocks={apolloMocks} addTypename={false}> + {children} + </MockedProvider> + </Provider> + ); + }; + + return tlRender(component, { wrapper: Wrapper, ...renderOptions }); +}; + +export * from '@testing-library/react-native'; + +export { render }; --- packages/allspark-foundation-hub/__tests__/utils/setup.js @@ -0,0 +1,33 @@ +jest.mock('react-native/Libraries/EventEmitter/NativeEventEmitter'); +const { NativeModules } = require('react-native'); + +// Stub out NativeModules +NativeModules.RNCNetInfo = {}; +NativeModules.RNGestureHandlerModule = {}; +NativeModules.RNDeviceInfo = {}; +NativeModules.RNCAsyncStorage = {}; + +jest.mock('react-native-reanimated', () => { + const Reanimated = require('react-native-reanimated/mock'); + + Reanimated.default.call = () => {}; + + return Reanimated; +}); + +jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper'); + +// Reset the redux store before each test +const { AllsparkReduxStore } = require('../../src/Redux'); +AllsparkReduxStore.resetStore(); + +// Reinitalize the environment before each test with Me@ dev variables +const { AllsparkEnvironment } = require('../../src/Environment'); + +// Setup environment with test variables +AllsparkEnvironment.initialize({ + env: 'dev', + config: { + dev: {}, + }, +}); --- packages/allspark-foundation/__tests__/HubFeature/Hub/__snapshots__/AddEditButton.test.tsx.snap @@ -78,6 +78,7 @@ exports[`AddEditButton renders correctly 1`] = ` style={ { "color": "#000", + "fontFamily": "Bogle-Regular", "fontSize": 14, "marginBottom": 4, "marginTop": 4, --- packages/allspark-foundation/__tests__/HubFeature/Hub/__snapshots__/TeamOnboardingScreen.test.tsx.snap @@ -317,20 +317,20 @@ exports[`TeamOnboardingScreen renders screen correctly 1`] = ` accessibilityActions={ [ { - "label": "Choose Teams - button", - "name": "Choose Teams", + "label": "Choose teams - button", + "name": "Choose teams", }, ] } accessibilityRole="button" disabled={false} isFullWidth={true} - onPress={[MockFunction]} + onPress={[Function]} size="medium" testID="onboarding-entry-btn" variant="primary" > - Choose Teams + Choose teams </Button> </View> </View> --- packages/allspark-foundation/__tests__/HubFeature/Hub/__snapshots__/VerticalDivider.test.tsx.snap @@ -6,7 +6,8 @@ exports[`VerticalDivider renders correctly 1`] = ` { "alignSelf": "center", "backgroundColor": "#e3e4e5", - "height": 64, + "height": 44, + "marginBottom": 24, "width": 1, } }
feat(ui): Update allspark foundation hub
feat(ui): Update allspark foundation hub
ef828c0f432f0a68ae4773dc5aad6616e4afe031
--- package.json @@ -81,7 +81,7 @@ "@walmart/core-utils": "~1.0.10", "@walmart/counts-component-miniapp": "0.0.35", "@walmart/exception-mini-app": "0.42.1", - "@walmart/facilities-management-miniapp": "0.0.5", + "@walmart/facilities-management-miniapp": "0.0.6", "@walmart/feedback-all-spark-miniapp": "0.6.0", "@walmart/functional-components": "2.0.3", "@walmart/gta-react-native-calendars": "0.0.15",
Feedback comments resolution
Feedback comments resolution
af550f9df1d93ad23e84de59682c3bd009c9a3c0
--- .looper-pr.yml @@ -20,19 +20,14 @@ envs: STAGES_TO_RUN: LINT: true UNITTEST: true - BUILD: true + BUILD: false SONAR_SCAN: true ARTIFACT_PUBLISH: true AUTO_PR_MONO: false - BUILD_TO_RUN: - ANDROID_BUILD: true - IOS_BUILD: true - SAUCELAB_UPLOAD: false - PROXIMITY_UPLOAD: true ALLOW_NPM_PUSH_TO_AF: true JIRAPREFIX: SSMP MONO_REPO: allspark/allspark-core MONO_REPO_BASE_BRANCH: develop AUTHOR: temp SLACK_CHANNEL: "smdv-miniapp" - BUILD_TYPE: 'SNAPSHOT' +
chore(looper): revert to original looper file
chore(looper): revert to original looper file
3ad14cbed229cff46d5c6443e582aa1f5214c19b
--- package-lock.json @@ -3124,9 +3124,9 @@ } }, "@walmart/push-to-talk-mini-app": { - "version": "0.3.3", - "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.3.3.tgz", - "integrity": "sha512-7pMyafDdZTxfVxEZbwWjlff8H2Kb97DBw+eUDarbxV2kv9ySrWiGvtTTj2+t63XTS94eTg9kD0nwZ7Pg3GX2pg==" + "version": "0.3.4", + "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.3.4.tgz", + "integrity": "sha512-6HTbFrCoOfCBUmwvh5BWQ3ZGpd147B7lmH7bxizPtLdK1L35MftKfCx9qfN+t51eN96oT62AQQYXUG9uYI2mtg==" }, "@walmart/react-native-collapsible": { "version": "1.5.3", --- package.json @@ -58,7 +58,7 @@ "@walmart/impersonation-mini-app": "1.0.12", "@walmart/inbox-mini-app": "0.0.54", "@walmart/moment-walmart": "1.0.4", - "@walmart/push-to-talk-mini-app": "0.3.3", + "@walmart/push-to-talk-mini-app": "0.3.4", "@walmart/react-native-env": "^0.1.0", "@walmart/react-native-logger": "^1.22.0", "@walmart/react-native-shared-navigation": "^0.3.0",
Mocking the PTT roster for service accounts (#378)
Mocking the PTT roster for service accounts (#378) * Bumping PTT version * PTT version bump * PTT version bump for Service Accounts Co-authored-by: Hitesh Arora - h0a006n <Hitesh.Arora@walmart.com>
9aeb5b34caa40f1ce824969af6b7e7b5a2a01971
--- packages/allspark-foundation/src/Components/Hub/Container/mockData.ts @@ -105,9 +105,9 @@ export const testData1 = { }; export const testRes1 = { - teamWidgetMapping: { + // teamWidgetMapping: { team1: { name: 'Team 1', widgets: ['widget1', 'widget3'] }, - }, + // }, }; export const testData2 = { @@ -143,15 +143,66 @@ export const testData3 = { }, }; export const testRes3 = { - teamWidgetMapping: { + // teamWidgetMapping: { team1: { name: 'Team 1', widgets: ['widget1', 'widget3'] }, team2: { name: 'Team 2', widgets: ['widgetB', 'widgetC'] }, - }, + // }, }; export const testData4 = { teamWidgetMapping: {}, }; -export const testRes4 = { - teamWidgetMapping: {}, +export const testRes4 = {}; + +export const testData5 = { + teamWidgetMapping: { + team1: { + name: 'Team 1', + widgets: [ + { name: 'widget1', rank: 1, enable: true }, + { name: 'widget2', rank: 1, enable: true }, + { name: 'widget3', rank: 2, enable: true }, + ], + }, + }, +}; + +export const testRes5 = { + team1: { name: 'Team 1', widgets: ['widget1', 'widget2', 'widget3'] }, }; + +export const testData6 = { + teamWidgetMapping: { + team1: { + name: 'Team 1', + widgets: [ + { name: 'widget1', rank: -1, enable: true }, + { name: 'widget2', rank: -3, enable: true }, + { name: 'widget3', rank: 0, enable: true }, + ], + }, + }, +}; + +export const testRes6 = { + team1: { name: 'Team 1', widgets: ['widget2', 'widget1', 'widget3'] }, +}; + +export const testData7 = { + teamWidgetMapping: { + team1: { + name: 'Team 1', + widgets: [ + { name: 'widget1', rank: 100, enable: true }, + { name: 'widget2', rank: 50, enable: true }, + { name: 'widget3', rank: 200, enable: true }, + ], + }, + }, +}; + +export const testRes7 = { + team1: { name: 'Team 1', widgets: ['widget2', 'widget1', 'widget3'] }, +}; + +
rebase commit 5
rebase commit 5
2bf84b5368e6c7282e067175364fb6ee33817642
--- ios/Podfile.lock @@ -2232,7 +2232,7 @@ PODS: - FirebaseMessaging (<= 10.18.0) - StructuredLogAssistantIOS (= 0.0.7) - TOCropViewController (2.6.1) - - topstock-mini-app (1.12.0): + - topstock-mini-app (1.9.7): - React - VisionCamera (3.7.1): - React @@ -2899,7 +2899,7 @@ SPEC CHECKSUMS: StructuredLogAssistantIOS: d48c327b3b67366d954435891dc1e748a6aeb9c1 SumoSDK: 58664bf3b83e2f4bcdfc52704235ab4bca519ceb TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863 - topstock-mini-app: 37f838d08fe79248fc2e39c3f003e07afa51c2df + topstock-mini-app: a58be8e38900135dbfe432bb35d5c9a2acaf6c4a VisionCamera: ef56ac9d3e0fef4b94c7cf75735aaccc2326e35a walmart-react-native-sumo-sdk: a6dc20c0ec3c8ab878886529a0e2fc22e747821c WebexSDK: d652713bd7ad5902e81918121912ba75a0056c3b --- package.json @@ -146,7 +146,7 @@ "@walmart/store-feature-orders": "1.26.9", "@walmart/taskit-mini-app": "3.0.2", "@walmart/time-clock-mini-app": "2.395.0", - "@walmart/topstock-mini-app": "1.12.0", + "@walmart/topstock-mini-app": "1.9.7", "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.15.14#~/.yarn/patches/@walmart-ui-components-npm-1.15.14-a6f67304be.patch", "@walmart/welcomeme-mini-app": "0.94.0", "@walmart/wfm-ui": "0.8.12", --- yarn.lock @@ -7259,9 +7259,9 @@ __metadata: languageName: node linkType: hard -"@walmart/topstock-mini-app@npm:1.12.0": - version: 1.12.0 - resolution: "@walmart/topstock-mini-app@npm:1.12.0" +"@walmart/topstock-mini-app@npm:1.9.7": + version: 1.9.7 + resolution: "@walmart/topstock-mini-app@npm:1.9.7" peerDependencies: "@react-native-firebase/app": ^15.1.1 "@react-native-firebase/crashlytics": ^15.1.1 @@ -7278,7 +7278,7 @@ __metadata: react-native-haptic-feedback: ^1.13.0 react-native-vector-icons: ">=6.6.0" react-redux: ">=7.2.0" - checksum: 10c0/64d49669316e55d8ed1bdce780f830cdf660d919b314d1f351dbc0e9877442cc268c3a1c34d768a1f4ed180f82ddfb6dae0e8cf7fe91483f9f2824c9c0fae105 + checksum: 10c0/05755222cebe2c0bafd4393e8c80c7a2ae4c046b6c86e4adbfd7fd4a2f95b527b1314b19b29d85e28b1926cd4822d2bc2eb90cacbfb7a0585ccd3fdcb5357780 languageName: node linkType: hard @@ -7861,7 +7861,7 @@ __metadata: "@walmart/store-feature-orders": "npm:1.26.9" "@walmart/taskit-mini-app": "npm:3.0.2" "@walmart/time-clock-mini-app": "npm:2.395.0" - "@walmart/topstock-mini-app": "npm:1.12.0" + "@walmart/topstock-mini-app": "npm:1.9.7" "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.15.14#~/.yarn/patches/@walmart-ui-components-npm-1.15.14-a6f67304be.patch" "@walmart/welcomeme-mini-app": "npm:0.94.0" "@walmart/wfm-ui": "npm:0.8.12"
topstock downgrade version to 1.9.7
topstock downgrade version to 1.9.7
29ded4e6f114c9632176f32d9ddaf046d9279d4e
--- package-lock.json @@ -63,7 +63,7 @@ "@walmart/onewalmart-miniapp": "1.0.14", "@walmart/pay-stub-miniapp": "0.9.31", "@walmart/payrollsolution_miniapp": "0.130.34", - "@walmart/price-changes-mini-app": "1.8.7", + "@walmart/price-changes-mini-app": "1.8.8", "@walmart/profile-feature-app": "0.143.0", "@walmart/push-to-talk-mini-app": "1.9.22", "@walmart/react-native-encrypted-storage": "1.1.3", @@ -5671,9 +5671,9 @@ } }, "node_modules/@walmart/price-changes-mini-app": { - "version": "1.8.7", - "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.8.7.tgz", - "integrity": "sha512-M+CKb5lcsa+whMCVUh+D50N0JSLRLyBdmWAMEZn8DI0ks9+MtWQ6XIEyiPKD9q4c8UQGm2AZ+tgiGIT7hcg+IA==", + "version": "1.8.8", + "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.8.8.tgz", + "integrity": "sha512-VLjYbHdNKmIoyuMxmZGR0JYCYajLWB2VEO2mMTpQxrSxYYt5dK5bU59m6kVtwkPEG4lJV0oNfICRPd6K/f4kSg==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -25363,9 +25363,9 @@ } }, "@walmart/price-changes-mini-app": { - "version": "1.8.7", - "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.8.7.tgz", - "integrity": "sha512-M+CKb5lcsa+whMCVUh+D50N0JSLRLyBdmWAMEZn8DI0ks9+MtWQ6XIEyiPKD9q4c8UQGm2AZ+tgiGIT7hcg+IA==" + "version": "1.8.8", + "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.8.8.tgz", + "integrity": "sha512-VLjYbHdNKmIoyuMxmZGR0JYCYajLWB2VEO2mMTpQxrSxYYt5dK5bU59m6kVtwkPEG4lJV0oNfICRPd6K/f4kSg==" }, "@walmart/profile-feature-app": { "version": "0.143.0" --- package.json @@ -105,7 +105,7 @@ "@walmart/onewalmart-miniapp": "1.0.14", "@walmart/pay-stub-miniapp": "0.9.31", "@walmart/payrollsolution_miniapp": "0.130.34", - "@walmart/price-changes-mini-app": "1.8.7", + "@walmart/price-changes-mini-app": "1.8.8", "@walmart/profile-feature-app": "0.143.0", "@walmart/push-to-talk-mini-app": "1.9.22", "@walmart/react-native-encrypted-storage": "1.1.3",
chore: Updating PC to 1.8.8
chore: Updating PC to 1.8.8
7c6081373ed635b20efc52f282eeb1c76eeda0b7
--- package-lock.json @@ -77,7 +77,7 @@ "@walmart/mod-flex-mini-app": "1.15.5", "@walmart/moment-walmart": "1.0.4", "@walmart/money-auth-shared-components": "0.1.4", - "@walmart/myteam-mini-app": "1.1.5", + "@walmart/myteam-mini-app": "1.1.6", "@walmart/onewalmart-miniapp": "1.0.24", "@walmart/pay-stub-miniapp": "0.15.2", "@walmart/payrollsolution_miniapp": "0.138.4", @@ -94,7 +94,7 @@ "@walmart/receipt-check-miniapp": "1.19.3", "@walmart/redux-store": "6.0.0", "@walmart/returns-mini-app": "3.13.0", - "@walmart/roster-mini-app": "1.1.5", + "@walmart/roster-mini-app": "1.1.6", "@walmart/schedule-mini-app": "0.93.0", "@walmart/shelfavailability-mini-app": "1.5.20", "@walmart/store-feature-orders": "1.26.5", @@ -11961,9 +11961,9 @@ } }, "node_modules/@walmart/myteam-mini-app": { - "version": "1.1.5", - "resolved": "https://npme.walmart.com/@walmart/myteam-mini-app/-/myteam-mini-app-1.1.5.tgz", - "integrity": "sha512-HYWvh+WIM+ZUB5kEuPfpkmjPYPnyAfIvdd/oHQ/bkdr4v8ZyW4p/UkwNllRsd+2bkL7CtjiOO+arvKSzdOzYZw==", + "version": "1.1.6", + "resolved": "https://npme.walmart.com/@walmart/myteam-mini-app/-/myteam-mini-app-1.1.6.tgz", + "integrity": "sha512-RJzATpnbiaw9iWdxbwd5PxkunTDtBk/7jPE+2yrNLBR9ZPuAjkoAm5M6vcMHHd/EEYrNidMO/oHjEae6cEr4sQ==", "hasInstallScript": true }, "node_modules/@walmart/onewalmart-miniapp": { @@ -12231,9 +12231,9 @@ } }, "node_modules/@walmart/roster-mini-app": { - "version": "1.1.5", - "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.1.5.tgz", - "integrity": "sha512-7sCioyivT+L57LBNg9QaagIVwawXYJpQAx+GngGRfw/+IKie6P1mT2IBuJ/cPHQxKvDhm38IMcsFCq1fBtuSCg==", + "version": "1.1.6", + "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.1.6.tgz", + "integrity": "sha512-Eq6SuPYcGEQVav2nilmZCMA1T/+0S2GfdgzoSlCGB638HsLYljonsXcVXUkeh3i8rshljV9Q5qwVJDgy3o28Sg==", "hasInstallScript": true }, "node_modules/@walmart/schedule-mini-app": { --- package.json @@ -118,7 +118,7 @@ "@walmart/mod-flex-mini-app": "1.15.5", "@walmart/moment-walmart": "1.0.4", "@walmart/money-auth-shared-components": "0.1.4", - "@walmart/myteam-mini-app": "1.1.5", + "@walmart/myteam-mini-app": "1.1.6", "@walmart/onewalmart-miniapp": "1.0.24", "@walmart/pay-stub-miniapp": "0.15.2", "@walmart/payrollsolution_miniapp": "0.138.4", @@ -135,7 +135,7 @@ "@walmart/receipt-check-miniapp": "1.19.3", "@walmart/redux-store": "6.0.0", "@walmart/returns-mini-app": "3.13.0", - "@walmart/roster-mini-app": "1.1.5", + "@walmart/roster-mini-app": "1.1.6", "@walmart/schedule-mini-app": "0.93.0", "@walmart/shelfavailability-mini-app": "1.5.20", "@walmart/store-feature-orders": "1.26.5",
Update version
Update version
81ca9471fffeb4e17c6a228a83072b2c60b3d60e
--- packages/allspark-foundation/src/Feature/AllsparkFeatureModule.tsx @@ -590,8 +590,6 @@ export class AllsparkFeatureModule< * featureModule.connect(); */ public connect = (capability?: ConnectCapabilities) => { - this._runConnectFeatureEvent(capability); - switch (capability) { case 'components': this._connectComponents(); @@ -624,6 +622,9 @@ export class AllsparkFeatureModule< this._connectModals(); } } + + this._runConnectFeatureEvent(capability); + return this; };
fix: feature connect event emitted before capabilities connected
fix: feature connect event emitted before capabilities connected
7b5dfb0122509b88c2aa37b0bdcd974a0e5b8f27
--- packages/allspark-foundation/src/Container/README.md @@ -16,7 +16,7 @@ The container name is used by features at runtime to identify which container th The container configuration has one required value, `services`. This sets the implementation of the dynamic allspark services that will be used by the container and features. -### Container Config +### Container Configuration | Property | Required | Type | Notes | | ---- | ---- | ---- | ---- | @@ -40,8 +40,6 @@ const MyAppContainer = new AllsparkContainer('MyContainer', { }); ``` -Optionally, you can configure static allspark services on the container configuration as well. - ## Provider A container's provider should wrap the root of your app. It will setup all necessary context and initialize environment, services, and features.
chore: update documentation
chore: update documentation
55c8661273af2e0a730e63987bc0c796e282036a
--- example/src/core/index.tsx @@ -24,9 +24,13 @@ const MainStack = () => { <Stack.Navigator screenOptions={{ header: Header, - headerLeft: DrawerButton, + // headerLeft: DrawerButton, }}> - <Stack.Screen name="home" component={HomeScreen} /> + <Stack.Screen + name="home" + component={HomeScreen} + options={{headerLeft: DrawerButton}} + /> {navigation.buildStack(Stack)} </Stack.Navigator> </> --- packages/core-services/Environment/index.tsx @@ -53,12 +53,10 @@ export const EnvironmentExtensionProvider = forwardRef< const { env, featureId, children } = props; useEffect(() => { - AllsparkEnvironment.addFeatureConfig(featureId, env); + AllsparkEnvironment.addFeatureEnv(featureId, env); }, []); - useImperativeHandle(ref, () => - AllsparkEnvironment.getFeatureConfig(featureId) - ); + useImperativeHandle(ref, () => AllsparkEnvironment.getFeatureEnv(featureId)); return <>{children}</>; }); --- packages/core-services/HttpClient/index.tsx @@ -88,7 +88,7 @@ export const useHttpClient = () => AllsparkHttpClient; export const useHttpClientClone = ( config: Omit<HttpClientConfig, 'baseURL'> | undefined, id: string -) => AllsparkHttpClient.createFeatureInstance(id, config); +) => AllsparkHttpClient.createFeatureClient(id, config); /** * @deprecated HttpClient can be accessed globally with AllsparkHttpClient from '@walmart/allspark-foundation/HTTP' @@ -136,7 +136,7 @@ export const HttpClientCloneProvider = forwardRef< const { children, id, config } = props; useImperativeHandle(ref, () => - AllsparkHttpClient.createFeatureInstance(id, config) + AllsparkHttpClient.createFeatureClient(id, config) ); return <>{children}</>;
chore: fix references
chore: fix references
88740a5dad9c6716a94fafa082d27d020d86b9ef
--- __tests__/navigation/USHallway/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -14,7 +14,7 @@ exports[`AssociateHallwayNav renders MainStackNav 1`] = ` } > <Screen - component="MainTabsNav" + component={[Function]} name="tabs" options={ { --- src/navigation/USHallway/AssociateHallwayNav/MainStackNav.tsx @@ -1,5 +1,5 @@ import {TransitionPresets, createStackNavigator} from '@react-navigation/stack'; -import React, {useEffect} from 'react'; +import React, {useEffect, Suspense} from 'react'; import {Platform} from 'react-native'; import {useDispatch} from 'react-redux'; @@ -61,6 +61,7 @@ import celebrationFeature from '@walmart/celebration-mini-app'; import associateExpHubTeamSwitcherFeature from '@walmart/associate-exp-hub-team-switcher'; import {useMyWalmartV2} from '@/hooks/useMyWalmartV2'; +import {HomeSkeleton} from '@/components/HomeSkeleton'; import AttendanceFeature from '@/features/attendance'; import {CallingFeature} from '@/features/calling'; @@ -86,6 +87,22 @@ import {createMiniAppScreens} from '../../../core/CreateGuardedScreens'; import SidekickMiniApp from '@walmart/sidekick-mini-app'; import {CompShopperModule} from '@walmart/comp-shopper-mini-app'; +// Lazy load tab navigation components +const LazyTabsLayoutV2 = React.lazy(() => import('../../../app/tabs/_layout')); +const LazyTabsLayoutV1 = React.lazy(() => import('./Tabs/index').then(m => ({default: m.MainTabsNav}))); + +// Wrapper components with Suspense boundary to show HomeSkeleton while loading +const TabsLayoutV2 = (props: any) => ( + <Suspense fallback={<HomeSkeleton testID="home-skeleton-v2" />}> + <LazyTabsLayoutV2 {...props} /> + </Suspense> +); + +const TabsLayoutV1 = (props: any) => ( + <Suspense fallback={<HomeSkeleton testID="home-skeleton-v1" />}> + <LazyTabsLayoutV1 {...props} /> + </Suspense> +); //--- Main Stack --- // const MainStack = createStackNavigator<MainStackMap>(); @@ -218,7 +235,7 @@ export const MainStackNav = () => { <> <MainStack.Screen name="tabs" - component={require('../../../app/tabs/_layout').default} + component={TabsLayoutV2} options={{ headerShown: true, title: t('forYou.headerTitle'), // Set initial title for the first tab, as this title is visible before onFocus. @@ -237,7 +254,7 @@ export const MainStackNav = () => { ) : ( <MainStack.Screen name="tabs" - component={require('./Tabs/index').MainTabsNav} + component={TabsLayoutV1} options={{ headerShown: false, }} --- src/navigation/USHallway/index.tsx @@ -1,4 +1,4 @@ -import React, {useState, useEffect} from 'react'; +import React, {Suspense} from 'react'; import {useSelector} from 'react-redux'; import {UserSelectors} from '@walmart/allspark-foundation/User'; import {UserType} from '@walmart/me-at-walmart-common'; @@ -38,28 +38,19 @@ const LazyAssociateHallway = React.lazy(() => import('./AssociateHallwayNav')); * @returns The appropriate hallway component or skeleton loader */ export default function USHallway(props: any) { - // Track whether initial interactions have completed - const [isReady, setIsReady] = useState(false); - // Determine user type from Redux store to select the appropriate hallway const userType = useSelector(UserSelectors.getUserType); - useEffect(() => { - setIsReady(true); - }, []); - - // Show skeleton UI until component has mounted - if (!isReady) { - return <HomeSkeleton testID="home-skeleton" />; - } - // Inline require delays loading of either hallway until hallwayType is determined // This is a performance optimization to avoid loading both components at startup - // Requiring the hallway can be expensive and result in a delay, in which case the HomeSkeleton // will remain displayed until the hallway is ready due to the synchronous nature of require - if (userType === UserType.prehire) { - return <LazyPrehireHallway {...props} testID='prehire-hallway' />; - } else { - return <LazyAssociateHallway {...props} testID='associate-hallway' />; - } + return ( + <Suspense fallback={<HomeSkeleton testID="home-skeleton" />}> + {userType === UserType.prehire ? ( + <LazyPrehireHallway {...props} testID='prehire-hallway' /> + ) : ( + <LazyAssociateHallway {...props} testID='associate-hallway' /> + )} + </Suspense> + ); };
feat: add suspense for loading (#5217)
feat: add suspense for loading (#5217)
13cc64c22589451d731c75cb1ddf6edf7d3260a4
--- src/containers/StoreChatCard.tsx @@ -24,7 +24,6 @@ import {TextingNavParamsMap} from '../navigation'; import {useSelector} from 'react-redux'; import {messageButtonEnabled, pushToTalkEnabled} from '../redux/selectors'; import {associateIsClockedIn} from '../utils'; -import {Associate} from '../types'; const styles = StyleSheet.create({ viewTeamStyle: { --- src/containers/StoreChatCard.tsx @@ -24,7 +24,6 @@ import {TextingNavParamsMap} from '../navigation'; import {useSelector} from 'react-redux'; import {messageButtonEnabled, pushToTalkEnabled} from '../redux/selectors'; import {associateIsClockedIn} from '../utils'; -import {Associate} from '../types'; const styles = StyleSheet.create({ viewTeamStyle: {
fix lint error
fix lint error
598ec81bd456eaa34340298b255fc1f858b8e1d0
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.19.0", + "version": "2.20.0", "main": "dist/index.js", "files": [ "dist" --- src/navigation/index.tsx @@ -4,7 +4,7 @@ import {RosterNavParamsMap} from './types'; import {RosterDetailScreen} from '../screens/RosterDetailScreen'; import {AllTeamsScreen} from '../screens/AllTeamsScreen'; -const RosterStack = createStackNavigator<RosterNavParamsMap>(); +export const RosterStack = createStackNavigator<RosterNavParamsMap>(); export * from './types'; --- src/shared/index.tsx @@ -1,3 +1,4 @@ export {RosterDetailScreen} from '../screens/RosterDetailScreen'; export {AllTeamsScreen} from '../screens/AllTeamsScreen'; export {RosterWidget} from '../components/RosterWidget'; +export * from '../navigation';
Update the test changes
Update the test changes
71013e3727e203a2c0272355fd42c33494e8fb18
--- packages/allspark-foundation/__tests__/Components/context.test.tsx @@ -0,0 +1,42 @@ +import React from 'react'; +import { render } from '@testing-library/react-native'; +import { AllsparkComponentProvider, useAllsparkImage, useAllsparkComponent } from '../../src/Components/context'; +import { Image, Text } from 'react-native'; + +describe('AllsparkComponentContext', () => { + it('custom Image component when overridden', () => { + const CustomImage = (props: any) => <Image {...props} testID="CustomImage" />; + const TestComponent = () => { + const AllsparkImage = useAllsparkImage(); + return <AllsparkImage source={{ uri: 'custom-image-uri' }} />; + }; + + const { getByTestId } = render( + <AllsparkComponentProvider components={{ Image: CustomImage }}> + <TestComponent /> + </AllsparkComponentProvider> + ); + + const customImage = getByTestId('CustomImage'); + expect(customImage.props.source.uri).toBe('custom-image-uri'); + }); + + it('provide the custom ErrorMessage component', () => { + const CustomErrorMessage = ({ message }: { message: string }) => ( + <Text testID="CustomErrorMessage">{message}</Text> + ); + + const TestComponent = () => { + const AllsparkErrorMessage = useAllsparkComponent('ErrorMessage'); + return <AllsparkErrorMessage message="Custom error" />; + }; + + const { getByTestId } = render( + <AllsparkComponentProvider components={{ ErrorMessage: CustomErrorMessage }}> + <TestComponent /> + </AllsparkComponentProvider> + ); + const customErrorMessage = getByTestId('CustomErrorMessage'); + expect(customErrorMessage.children[0]).toBe('Custom error'); + }); +}); --- packages/allspark-foundation/__tests__/Feature/validate.test.ts @@ -0,0 +1,63 @@ +import { validateFeatureId, validateScreenName, validateModalName } from '../../src/Feature/validate'; + +describe('Validation Utilities', () => { + const originalWarn = console.warn; + + beforeEach(() => { + console.warn = jest.fn(); + }); + + afterEach(() => { + console.warn = originalWarn; + }); + + it('should not warn if "mini" or "app" is not in the feature ID', () => { + const featureId = validateFeatureId('validFeatureId'); + expect(console.warn).not.toHaveBeenCalled(); + expect(featureId).toBe('validFeatureId'); + }); + + it('should warn if "mini" is included in the feature ID', () => { + const featureId = validateFeatureId('miniFeature'); + expect(console.warn).toHaveBeenCalledWith( + 'Do not include "mini" or "app" in an AllsparkFeature\'s ID: miniFeature' + ); + expect(featureId).toBe('miniFeature'); + }); + + it('should warn if "app" is included in the feature ID', () => { + const featureId = validateFeatureId('appFeature'); + expect(console.warn).toHaveBeenCalledWith( + 'Do not include "mini" or "app" in an AllsparkFeature\'s ID: appFeature' + ); + expect(featureId).toBe('appFeature'); + }); + + it('should not warn if the screen name has the correct prefix', () => { + const screenName = validateScreenName('featureId.Screen', 'featureId'); + expect(console.warn).not.toHaveBeenCalled(); + expect(screenName).toBe('featureId.Screen'); + }); + + it('should warn if the screen name does not have the correct prefix', () => { + const screenName = validateScreenName('wrongFeatureId.Screen', 'featureId'); + expect(console.warn).toHaveBeenCalledWith( + 'Screen "wrongFeatureId.Screen", registered to AllsparkFeature featureId, is using the prefix "wrongFeatureId". Screen names should be prefixed with your feature id. Ex: featureId.Screen. Consider renaming your screen so the prefix is the feature id. ' + ); + expect(screenName).toBe('wrongFeatureId.Screen'); + }); + + it('should warn if the screen name does not include a prefix', () => { + const screenName = validateScreenName('Screen', 'featureId'); + expect(console.warn).toHaveBeenCalledWith( + 'Screen "Screen", registered to AllsparkFeature featureId, does not include a prefix. Screen names should be prefixed with your feature id: Ex: featureId.Screen' + ); + expect(screenName).toBe('Screen'); + }); + + it('should call validateScreenName with type "Modal" when validating modal name', () => { + const modalName = validateModalName('featureId.Modal', 'featureId'); + expect(console.warn).not.toHaveBeenCalled(); + expect(modalName).toBe('featureId.Modal'); + }); + }); \ No newline at end of file --- packages/allspark-foundation/__tests__/HTTP/client.test.ts @@ -64,30 +64,6 @@ describe('AllsparkHttpClient', () => { jest.spyOn(AllsparkHttpClient, 'request').mockRejectedValue(new Error('Network error')); await expect(AllsparkHttpClient.fetch(input, init)).rejects.toThrow('Network error'); }); -// it('should handle legacy format and warn when data contains a data property', async () => { -// const url = 'https://api.example.com/legacy'; -// const data = { -// data: { key: 'value' }, -// configOption: 'example-config', -// }; - -// jest.spyOn(AllsparkHttpClient, 'request').mockResolvedValue({ -// data: 'response data', -// status: 200, -// statusText: 'OK', -// headers: { 'content-type': 'application/json' }, -// }); - -// const response = await AllsparkHttpClient.post(url, data); - -// expect(warnForLegacyCalls).toHaveBeenCalledWith('post', url, AllsparkHttpClient.featureId); -// expect(AllsparkHttpClient.request).toHaveBeenCalledWith({ -// method: 'post', -// url, -// ...data, -// }); -// expect(response.status).toBe(200); -// }); it('should handle legacy format and warn when data contains a data property', async () => { const url = 'https://api.example.com/legacy'; --- packages/allspark-foundation/__tests__/Translation/modals/provider.test.tsx @@ -1,5 +1,3 @@ -// __tests__/TranslationProvider.test.tsx - import React from 'react'; import { render } from '@testing-library/react-native'; import { TranslationProvider } from '../../../src/Translation/provider'; @@ -21,7 +19,6 @@ jest.mock('../../../src/Environment', () => ({ describe('TranslationProvider', () => { it('should call preRender with options', async () => { const options = { key: 'value' }; - await render( <TranslationProvider options={options}> <div>Test Child</div> @@ -31,7 +28,6 @@ describe('TranslationProvider', () => { }); it('should render children within I18nextProvider', async () => { - await render( <TranslationProvider> <div>Test Child</div>
validate context client and provider test
validate context client and provider test
442b16d26d69e119f7526842f54b5fa2f0ec0da6
--- env.teflon.js @@ -2,7 +2,7 @@ export default { // TODO - change below to "teflon" once one or more mini apps are ready; be aware some mini apps may fail or default to prod untiil they are updated to handle another environment env: 'dev', // TODO - change below to "teflon" once CCM is ready - deployment: 'dev', + deployment: 'teflon', consumerId: 'b5fc6fe0-5927-44a6-a693-6e922e830b04', pingFedEnv: 'CERT', redirectUri: 'com.walmart.stores.allspark.beta://SSOLogin', @@ -28,7 +28,7 @@ export default { internalBffUrl: 'https://api-proxy-es2.stg-us-azure.soa-api-proxy.platform.prod.us.walmart.net', externalBffUrl: 'https://developer.api.us.stg.walmart.com', - bffService: '/api-proxy/service/store/systems-bff/v1', + bffService: '/api-proxy/service/store/systems-bff/v0', allsparkService: 'https://developer.api.stg.walmart.com/api-proxy/service/allspark/api/v1', rbacAppId: 'ec9f5c40-88be-4e90-8807-a4f15f11e84c',
updating teflon file
updating teflon file
6105378d1a047cea08d81236ea3ea7d4d03e468e
--- targets/US/package.json @@ -142,7 +142,7 @@ "@walmart/react-native-webex-sdk": "patch:@walmart/react-native-webex-sdk@npm%3A0.4.3#~/.yarn/patches/@walmart-react-native-webex-sdk-npm-0.4.3-2621d9f1df.patch", "@walmart/receipt-check-miniapp": "1.27.3", "@walmart/redux-store": "~6.3.28", - "@walmart/returns-mini-app": "4.16.2", + "@walmart/returns-mini-app": "4.16.3", "@walmart/rfid-scan-mini-app": "2.7.1", "@walmart/rn-mobile-sdk-pairing": "2.0.4", "@walmart/rn-receiving-mini-app": "2.4.45", --- yarn.lock @@ -6500,6 +6500,15 @@ __metadata: languageName: node linkType: hard +"@walmart/common-utilities-js@npm:^1.2.10": + version: 1.2.10 + resolution: "@walmart/common-utilities-js@npm:1.2.10" + dependencies: + lodash: "npm:^4.17.15" + checksum: 10c0/0de4ac9c5a4dab4a00100c34d10bb4f8862cc4d32dc0d19bd5bcc364e7586ee1f2f76cd287dd4c329d5d80396b485b83ade7a30eabfec17900858ba9f43ba44f + languageName: node + linkType: hard + "@walmart/compass-sdk-rn@npm:5.19.15": version: 5.19.15 resolution: "@walmart/compass-sdk-rn@npm:5.19.15" @@ -7370,7 +7379,7 @@ __metadata: "@walmart/react-native-webex-sdk": "patch:@walmart/react-native-webex-sdk@npm%3A0.4.3#~/.yarn/patches/@walmart-react-native-webex-sdk-npm-0.4.3-2621d9f1df.patch" "@walmart/receipt-check-miniapp": "npm:1.27.3" "@walmart/redux-store": "npm:~6.3.28" - "@walmart/returns-mini-app": "npm:4.16.2" + "@walmart/returns-mini-app": "npm:4.16.3" "@walmart/rfid-scan-mini-app": "npm:2.7.1" "@walmart/rn-mobile-sdk-pairing": "npm:2.0.4" "@walmart/rn-receiving-mini-app": "npm:2.4.45" @@ -8047,9 +8056,12 @@ __metadata: languageName: node linkType: hard -"@walmart/returns-mini-app@npm:4.16.2": - version: 4.16.2 - resolution: "@walmart/returns-mini-app@npm:4.16.2" +"@walmart/returns-mini-app@npm:4.16.3": + version: 4.16.3 + resolution: "@walmart/returns-mini-app@npm:4.16.3" + dependencies: + "@walmart/common-utilities-js": "npm:^1.2.10" + "@walmart/virtual-zpl-printer-model": "npm:^0.2.11" peerDependencies: "@react-native-async-storage/async-storage": "*" "@react-navigation/native": ">=5" @@ -8072,7 +8084,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/1d3a29841c70accee9467ff3505cea9e8caa0531366af7d15a69a7cccabdd6a809f4209a4ce12089ee56ef035828415b366bff2d659090b60544c5431d9b8792 + checksum: 10c0/aaf23fb863498e5e4565840b953c04fd91c00e99cda3d8fcc20f6250346a2fe15b2e538c778c52be7ba574c32d0d316c72110c078f27b79ab53051ffe3fb661b languageName: node linkType: hard @@ -8402,6 +8414,13 @@ __metadata: languageName: node linkType: hard +"@walmart/timeamount@npm:^1.0.3": + version: 1.0.4 + resolution: "@walmart/timeamount@npm:1.0.4" + checksum: 10c0/cf1f7c026180936efaf4482493ba882910a44ea006fc572e5a6b9fa55f6e3ed8ae8622c47f2d6aa4e8019a5b8bc174735f659b9a36a8d6db488ce52f2d771891 + languageName: node + linkType: hard + "@walmart/topstock-mini-app@npm:1.20.4": version: 1.20.4 resolution: "@walmart/topstock-mini-app@npm:1.20.4" @@ -8495,6 +8514,16 @@ __metadata: languageName: node linkType: hard +"@walmart/virtual-zpl-printer-model@npm:^0.2.11": + version: 0.2.11 + resolution: "@walmart/virtual-zpl-printer-model@npm:0.2.11" + dependencies: + "@walmart/timeamount": "npm:^1.0.3" + lodash: "npm:^4.17.15" + checksum: 10c0/07c1420a53009cb552bbb1f127d860c6152d978d4f3066ec681ac29161022d3905f9f00078f9b2937d00573abbfc26c5a4f070ca8bf24d3685092da13c9d1358 + languageName: node + linkType: hard + "@walmart/walmart-fiscal-week@npm:^0.3.6": version: 0.3.6 resolution: "@walmart/walmart-fiscal-week@npm:0.3.6"
chore(ui):new version for updated dependencies
chore(ui):new version for updated dependencies
19f523292c44e2b0a7125292b5da8ce8957e9019
--- targets/US/package.json @@ -107,7 +107,7 @@ "@walmart/feedback-all-spark-miniapp": "0.9.72", "@walmart/financial-wellbeing-feature-app": "1.29.2", "@walmart/functional-components": "~6.3.28", - "@walmart/global-vpi-mini-app": "1.1.4", + "@walmart/global-vpi-mini-app": "1.1.5", "@walmart/gta-react-native-calendars": "0.7.0", "@walmart/gtp-shared-components": "2.2.4", "@walmart/ims-print-services-ui": "2.16.4", --- yarn.lock @@ -6739,10 +6739,10 @@ __metadata: languageName: node linkType: hard -"@walmart/global-vpi-mini-app@npm:1.1.4": - version: 1.1.4 - resolution: "@walmart/global-vpi-mini-app@npm:1.1.4" - checksum: 10c0/7815c22fa825bf65e5322556c005cece3d445c642e020cc6c2820203b1135a75f7156083d2ae1ec4231f4a72b57f840e9bc115e37c097650d5483c86d9ad60a0 +"@walmart/global-vpi-mini-app@npm:1.1.5": + version: 1.1.5 + resolution: "@walmart/global-vpi-mini-app@npm:1.1.5" + checksum: 10c0/47227ab6def41f458c3bf9f6b797eef67b9295bbf1bf6f130d97744dba16ce758553965230a1775fd6065ad048841e8103c92098a1137ec7d93a24e0defb0e05 languageName: node linkType: hard @@ -7344,7 +7344,7 @@ __metadata: "@walmart/feedback-all-spark-miniapp": "npm:0.9.72" "@walmart/financial-wellbeing-feature-app": "npm:1.29.2" "@walmart/functional-components": "npm:~6.3.28" - "@walmart/global-vpi-mini-app": "npm:1.1.4" + "@walmart/global-vpi-mini-app": "npm:1.1.5" "@walmart/gta-react-native-calendars": "npm:0.7.0" "@walmart/gtp-shared-components": "npm:2.2.4" "@walmart/ims-print-services-ui": "npm:2.16.4"
feat: added win number to setVPI service request body
feat: added win number to setVPI service request body
634267c9fa180a6eaf53d85ad276739f41a4aaab
--- package.json @@ -147,7 +147,7 @@ "@types/semver": "^7.3.4", "@types/uuid": "^8.3.0", "@walmart/allspark-foundation": "6.25.0", - "@walmart/allspark-foundation-hub": "1.2.3", + "@walmart/allspark-foundation-hub": "1.2.5", "@walmart/allspark-graphql-client": "~6.3.28", "@walmart/allspark-http-client": "~6.3.28", "@walmart/allspark-utils": "~6.5.0", --- targets/US/package.json @@ -78,7 +78,7 @@ "@walmart/allspark-authentication": "~6.4.1", "@walmart/allspark-cope-key-listener": "0.0.18", "@walmart/allspark-foundation": "6.25.0", - "@walmart/allspark-foundation-hub": "1.2.3", + "@walmart/allspark-foundation-hub": "1.2.5", "@walmart/allspark-graphql-client": "~6.3.28", "@walmart/allspark-http-client": "~6.3.28", "@walmart/allspark-neon-core": "0.1.31", --- yarn.lock @@ -5966,9 +5966,9 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-foundation-hub@npm:1.2.3": - version: 1.2.3 - resolution: "@walmart/allspark-foundation-hub@npm:1.2.3" +"@walmart/allspark-foundation-hub@npm:1.2.5": + version: 1.2.5 + resolution: "@walmart/allspark-foundation-hub@npm:1.2.5" dependencies: "@reduxjs/toolkit": "npm:^1.9.7" lodash: "npm:~4.17.21" @@ -5982,11 +5982,7 @@ __metadata: react: "*" react-native: "*" react-native-safe-area-context: 4.x - bin: - allspark-generate-graphql: cli/generate.js - allspark-link: cli/link.js - allspark-setup: cli/setup.js - checksum: 10c0/4f46fca2539ca91d38a404bdbd5fbb68ae189fdc35a67b63619d2507e2c71cfd2c7652bebee45edfb1dd779a01b2c72ecde7959154eb2fdf620dd4e72bcfd0af + checksum: 10c0/8d1bcb0270dbdfdd26c06a85640c0cea60da533f36ec7e8e8e258e0d35ffb1cb35509af22ae46f4e8406391deaaf23c7136d81b74e41b406140fb6e5b5f4d3bf languageName: node linkType: hard @@ -7286,7 +7282,7 @@ __metadata: "@walmart/allspark-authentication": "npm:~6.4.1" "@walmart/allspark-cope-key-listener": "npm:0.0.18" "@walmart/allspark-foundation": "npm:6.25.0" - "@walmart/allspark-foundation-hub": "npm:1.2.3" + "@walmart/allspark-foundation-hub": "npm:1.2.5" "@walmart/allspark-graphql-client": "npm:~6.3.28" "@walmart/allspark-http-client": "npm:~6.3.28" "@walmart/allspark-neon-core": "npm:0.1.31"
Update the my team mini app changes
Update the my team mini app changes
1369eee717386df6f747eaeb6ea3895a6e709abd
--- __tests__/auth/AuthenticatorViewTest.tsx @@ -33,13 +33,6 @@ jest.mock('../../src/auth/constants', () => ({ ALLSPARK_SIGN_IN: 'allspark_sign_in', })); -jest.mock('../../src/services/Logger', () => ({ - logger: { - error: jest.fn(), - info: jest.fn(), - }, -})); - jest.mock('../../src/auth/SectionCard', () => ({ SectionCard: 'SectionCard', })); --- __tests__/updates/UpdateCheckSagaTest.ts @@ -194,6 +194,18 @@ describe('onCheckForUpdates', () => { expect(iterator.next().done).toBe(true); }); + it('does not show prompt if updated verion from CCM is not valid number or undefined', () => { + const invalidVersionNumber = { + ...updateInfo, + versionNumber: undefined, + forceUpdate: false, + }; + const iterator = onCheckForUpdates(); + + expect(iterator.next().value).toEqual(call(getFormattedUpdateInfo)); + expect(iterator.next(invalidVersionNumber).done).toBe(true); + }); + it('does not show prompt if user has restricted device', () => { const currentAppVersion = '1.9.9'; const lastVersion = '1.9.6'; --- src/auth/AuthenticatorView.tsx @@ -11,7 +11,6 @@ import AsyncStorage from '@react-native-community/async-storage'; import {Display, PrimaryButton} from '@walmart/gtp-shared-components'; import WmTelemetry from 'react-native-wm-telemetry'; -import {logger} from '../services/Logger'; import {getFetchingUser, getShouldHideSplashOnAuth} from '../redux'; import {Images} from '../images'; import {SSO_APP} from '../types/telemetryConstants'; @@ -49,7 +48,6 @@ export const AuthenticatorView = () => { isPreHire: String(candidateMode), }); AsyncStorage.setItem(ALLSPARK_SIGN_IN, 'true'); - logger.info('Sign In Clicked', {}); }; const onAssociateSignIn = () => { --- src/core/appConfigInit.ts @@ -56,7 +56,6 @@ export function* initializeAppConfig() { }, forceRefreshInterval: MIN_ALLOWED_FORCE_REFRESH_INTERVAL, }); - logger?.info('triggering app config fetch from normal startup', {}); yield call(appConfigActions.appConfigInitSuccess); } catch (error) { yield call(appConfigActions.appConfigInitError, error); --- src/updates/UpdateCheckSaga.ts @@ -46,30 +46,35 @@ export function* onCheckForUpdates() { const latestVersion = updateInfo.versionNumber; const isForceUpdate = updateInfo.forceUpdate; - - const lastPromptedVersion = yield call( - AsyncStorage.getItem, - lastVersionKey, - ); - - const currentAppVersion = yield call(DeviceInfo.getVersion); - const isRestricted = yield call(getIsRestrictedDevice); - - const updateAvailable = - semver.gt(latestVersion, currentAppVersion) && !isRestricted; - - yield put( - UpdateCheckActionCreators.setUpdateAvailable(updateAvailable, updateInfo), - ); - - const hasSeenUpdatePrompt = lastPromptedVersion === latestVersion; - const shouldSeeUpdatePrompt = isForceUpdate || !hasSeenUpdatePrompt; - - if (updateAvailable && shouldSeeUpdatePrompt) { - yield call(AsyncStorage.setItem, lastVersionKey, latestVersion); - yield put(UpdateCheckActionCreators.setPrompt(true)); - } else { - yield put(UpdateCheckActionCreators.checkForUpdatesComplete()); + const hasValidVersionNumber = !!latestVersion; + if (hasValidVersionNumber) { + const lastPromptedVersion = yield call( + AsyncStorage.getItem, + lastVersionKey, + ); + + const currentAppVersion = yield call(DeviceInfo.getVersion); + const isRestricted = yield call(getIsRestrictedDevice); + + const updateAvailable = + semver.gt(latestVersion, currentAppVersion) && !isRestricted; + + yield put( + UpdateCheckActionCreators.setUpdateAvailable( + updateAvailable, + updateInfo, + ), + ); + + const hasSeenUpdatePrompt = lastPromptedVersion === latestVersion; + const shouldSeeUpdatePrompt = isForceUpdate || !hasSeenUpdatePrompt; + + if (updateAvailable && shouldSeeUpdatePrompt) { + yield call(AsyncStorage.setItem, lastVersionKey, latestVersion); + yield put(UpdateCheckActionCreators.setPrompt(true)); + } else { + yield put(UpdateCheckActionCreators.checkForUpdatesComplete()); + } } } catch (error) { const {message} = error;
Fix logging and sage update check
Fix logging and sage update check
d7be49be19698d3dbaf940644bd71bcb0752d521
--- .npmrc @@ -4,4 +4,4 @@ proxy=http://sysproxy.wal-mart.com:8080 https-proxy=http://sysproxy.wal-mart.com:8080 strict-ssl=false # legacy-peer-deps=true -no_proxy=walmart.api.crowdin.com,.wal-mart.com,.walmart.net,.walmart.com,localhost,127.0.0.1 \ No newline at end of file +no_proxy=walmart.api.crowdin.com,.wal-mart.com,.walmart.net,.walmart.com,localhost,127.0.0.1
Update mini app versions
Update mini app versions
bc4dca8e40ee8c1323218c45bf6038af9808a184
--- __tests__/navigation/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -64,6 +64,26 @@ exports[`AssociateHallwayNav matches snapshot 1`] = ` component="GuardedShelfAvailabilityMiniApp" name="shelfAvailability" /> + <Screen + component="SalesItemizedScreen" + name="metricsSalesDrilldown" + /> + <Screen + component="PresubItemizedScreen" + name="metricsPreSubDrilldown" + /> + <Screen + component="MetricsPreSubInfoModalScreen" + name="metricsPreSubInfoModal" + /> + <Screen + component="MetricsFtprInfoModalScreen" + name="metricsFtprInfoModal" + /> + <Screen + component="MetricsFtprTabNavigation" + name="metricsFTPDrilldown" + /> </Group> <Screen component="WhatsNewScreen" @@ -97,32 +117,6 @@ exports[`AssociateHallwayNav matches snapshot 1`] = ` <Group screenOptions={ Object { -<<<<<<< HEAD - "headerShown": false, - } - } - /> - <Screen - component="SalesItemizedScreen" - name="metricsSalesDrilldown" - /> - <Screen - component="PresubItemizedScreen" - name="metricsPreSubDrilldown" - /> - <Screen - component="MetricsPreSubInfoModalScreen" - name="metricsPreSubInfoModal" - /> - <Screen - component="MetricsFtprInfoModalScreen" - name="metricsFtprInfoModal" - /> - <Screen - component="MetricsFtprTabNavigation" - name="metricsFTPDrilldown" - /> -======= "cardStyleInterpolator": [MockFunction], "presentation": "transparentModal", } @@ -176,7 +170,6 @@ exports[`AssociateHallwayNav matches snapshot 1`] = ` name="SurveySaysDialog" /> </Group> ->>>>>>> 766a6f64d56d5c70d848cea3033cfc618bfc4bf3 </Navigator> <NotificationsContainer /> </ActivityMonitor> @@ -246,6 +239,26 @@ exports[`AssociateHallwayNav matches snapshot when time value are undefined 1`] component="GuardedShelfAvailabilityMiniApp" name="shelfAvailability" /> + <Screen + component="SalesItemizedScreen" + name="metricsSalesDrilldown" + /> + <Screen + component="PresubItemizedScreen" + name="metricsPreSubDrilldown" + /> + <Screen + component="MetricsPreSubInfoModalScreen" + name="metricsPreSubInfoModal" + /> + <Screen + component="MetricsFtprInfoModalScreen" + name="metricsFtprInfoModal" + /> + <Screen + component="MetricsFtprTabNavigation" + name="metricsFTPDrilldown" + /> </Group> <Screen component="WhatsNewScreen" @@ -279,32 +292,6 @@ exports[`AssociateHallwayNav matches snapshot when time value are undefined 1`] <Group screenOptions={ Object { -<<<<<<< HEAD - "headerShown": false, - } - } - /> - <Screen - component="SalesItemizedScreen" - name="metricsSalesDrilldown" - /> - <Screen - component="PresubItemizedScreen" - name="metricsPreSubDrilldown" - /> - <Screen - component="MetricsPreSubInfoModalScreen" - name="metricsPreSubInfoModal" - /> - <Screen - component="MetricsFtprInfoModalScreen" - name="metricsFtprInfoModal" - /> - <Screen - component="MetricsFtprTabNavigation" - name="metricsFTPDrilldown" - /> -======= "cardStyleInterpolator": [MockFunction], "presentation": "transparentModal", } @@ -358,7 +345,6 @@ exports[`AssociateHallwayNav matches snapshot when time value are undefined 1`] name="SurveySaysDialog" /> </Group> ->>>>>>> 766a6f64d56d5c70d848cea3033cfc618bfc4bf3 </Navigator> <NotificationsContainer /> </ActivityMonitor>
bumping metrics version
bumping metrics version
933afa90fb1873795eb7c88f4f59ade6de775dde
--- src/notification.ts @@ -5,14 +5,19 @@ import WmNotification, { import {createChannelPath} from './channels'; import {fetchResource} from './services/blob'; import {Audio} from 'expo-av'; -import {navigate, getCurrentRouteName} from "@walmart/react-native-shared-navigation"; +import { + navigate, + getCurrentRouteName, +} from '@walmart/react-native-shared-navigation'; async function playSound(filePath: string) { console.log('Loading Sound'); const {sound} = await Audio.Sound.createAsync({uri: filePath}); - console.log('Playing Sound'); - await sound.playAsync(); + console.log('Playing Sound for ' + filePath); + await sound.playAsync().then((playbackStatus) => { + console.log(playbackStatus); + }); } export const onTextMessageNotification = (event?: SumoPushEvent) => { --- src/services/blob.ts @@ -95,7 +95,7 @@ export const downloadBlobWithRetry = async ( * @returns localURI pointing to local file in file system */ export const fetchResource = async (remoteURI: string): Promise<string> => { - console.log('fetchResource remoteURI'); + console.log('fetchResource: remoteURI'); console.log(remoteURI); // if (Platform.OS === 'android') { // await PermissionsAndroid.request( --- src/notification.ts @@ -5,14 +5,19 @@ import WmNotification, { import {createChannelPath} from './channels'; import {fetchResource} from './services/blob'; import {Audio} from 'expo-av'; -import {navigate, getCurrentRouteName} from "@walmart/react-native-shared-navigation"; +import { + navigate, + getCurrentRouteName, +} from '@walmart/react-native-shared-navigation'; async function playSound(filePath: string) { console.log('Loading Sound'); const {sound} = await Audio.Sound.createAsync({uri: filePath}); - console.log('Playing Sound'); - await sound.playAsync(); + console.log('Playing Sound for ' + filePath); + await sound.playAsync().then((playbackStatus) => { + console.log(playbackStatus); + }); } export const onTextMessageNotification = (event?: SumoPushEvent) => { --- src/services/blob.ts @@ -95,7 +95,7 @@ export const downloadBlobWithRetry = async ( * @returns localURI pointing to local file in file system */ export const fetchResource = async (remoteURI: string): Promise<string> => { - console.log('fetchResource remoteURI'); + console.log('fetchResource: remoteURI'); console.log(remoteURI); // if (Platform.OS === 'android') { // await PermissionsAndroid.request(
merging in audio playback logic
merging in audio playback logic
07b03aef45d3cabbc30b90ec17bdd17b3c9cc068
--- packages/allspark-foundation-hub/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.8.6](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.8.5...@walmart/allspark-foundation-hub@1.8.6) (2025-05-06) + +**Note:** Version bump only for package @walmart/allspark-foundation-hub + ## [1.8.5](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.8.4...@walmart/allspark-foundation-hub@1.8.5) (2025-05-06) **Note:** Version bump only for package @walmart/allspark-foundation-hub --- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.8.5", + "version": "1.8.6", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", --- packages/me-at-walmart-athena-queries/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.32.2](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-athena-queries@6.32.1...@walmart/me-at-walmart-athena-queries@6.32.2) (2025-05-06) + +**Note:** Version bump only for package @walmart/me-at-walmart-athena-queries + ## [6.32.1](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-athena-queries@6.32.0...@walmart/me-at-walmart-athena-queries@6.32.1) (2025-04-17) **Note:** Version bump only for package @walmart/me-at-walmart-athena-queries --- packages/me-at-walmart-athena-queries/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart-athena-queries", - "version": "6.32.1", + "version": "6.32.2", "description": "> TODO: description", "author": "rlane1 <russell.lane@walmart.com>", "homepage": "",
chore(version): updating package version
chore(version): updating package version - @walmart/allspark-foundation-hub@1.8.6 - @walmart/me-at-walmart-athena-queries@6.32.2
405c12f134f887fcbdd764e4f28c350738557dbc
--- package.json @@ -140,7 +140,7 @@ "@walmart/redux-store": "6.1.4", "@walmart/returns-mini-app": "4.6.0", "@walmart/rfid-scan-mini-app": "2.3.16", - "@walmart/rn-receiving-mini-app": "2.2.140", + "@walmart/rn-receiving-mini-app": "2.2.146", "@walmart/roster-mini-app": "2.8.2", "@walmart/schedule-mini-app": "0.118.0", "@walmart/shelfavailability-mini-app": "1.5.26", --- yarn.lock @@ -5066,15 +5066,6 @@ __metadata: languageName: node linkType: hard -"@types/react-addons-shallow-compare@npm:^0.14.22": - version: 0.14.25 - resolution: "@types/react-addons-shallow-compare@npm:0.14.25" - dependencies: - "@types/react": "npm:*" - checksum: 10c0/03cbcebc462ffc2ea399bca699b0e9ee829dae7b38be8b7c1e1a970ef4943be9c8c6d770ac937a721bc0f311175a22ee33cb2b2d0c877c8951e82c1ca60863ee - languageName: node - linkType: hard - "@types/react-native-uuid@npm:^2.0.0": version: 2.0.0 resolution: "@types/react-native-uuid@npm:2.0.0" @@ -5673,11 +5664,9 @@ __metadata: languageName: node linkType: hard -"@walmart/atlas-rn-ui-components@npm:1.0.146": - version: 1.0.146 - resolution: "@walmart/atlas-rn-ui-components@npm:1.0.146" - dependencies: - react-native-snap-carousel: "npm:>=4.0.0-beta.6" +"@walmart/atlas-rn-ui-components@npm:1.0.147": + version: 1.0.147 + resolution: "@walmart/atlas-rn-ui-components@npm:1.0.147" peerDependencies: "@livingdesign/tokens": ">=0.63.0" "@react-native-picker/picker": ">=2.4.0" @@ -5697,7 +5686,7 @@ __metadata: bin: installFonts: scripts/installFonts runCodemods: scripts/runCodemods - checksum: 10c0/9d79418b94cb3f6bd5f4aba06cbaa4db727a40069060f831c8c57d8d761706811c20519869996333be4aace12493a91ea6a6ecef5aea241c66ff684b48144f74 + checksum: 10c0/f23eb6448f8c60d03adea51bbe7afff57d43d6909bd5e21d648184b10ed3a9497ad749cfe6aedff7a21404c3f6f42142b725945ae5b133c3dbfdb064314993ef languageName: node linkType: hard @@ -7027,11 +7016,11 @@ __metadata: languageName: node linkType: hard -"@walmart/rn-receiving-mini-app@npm:2.2.140": - version: 2.2.140 - resolution: "@walmart/rn-receiving-mini-app@npm:2.2.140" +"@walmart/rn-receiving-mini-app@npm:2.2.146": + version: 2.2.146 + resolution: "@walmart/rn-receiving-mini-app@npm:2.2.146" dependencies: - "@walmart/atlas-rn-ui-components": "npm:1.0.146" + "@walmart/atlas-rn-ui-components": "npm:1.0.147" "@walmart/loadquality-mini-app": "npm:0.3.44" peerDependencies: "@react-native-clipboard/clipboard": ">=1.14.0" @@ -7052,12 +7041,11 @@ __metadata: react: ^18.2.0 react-native: ~0.70.5 react-native-drop-shadow: ">=1.0.0" - react-native-snap-carousel: ">=4.0.0-beta.6" react-native-sound-player: ">=0.14.3" react-native-svg: ">=14.1.0" react-native-svg-transformer: ">=1.1.0" react-native-vision-camera: ^2.16.8 - checksum: 10c0/1baf50b032a10e2b83a0b00d7fdd8ecba96710cc9bc013e14ff27b58bc103989baa4945a3a4c03acc981deb9bba19a6fcb5560d63c3901ad28df160be3a7aff0 + checksum: 10c0/cdad579509242815810064c88d651718e86d2e44401fbe4482cb03b8bfb731ab94658785e8d1d0bb96b651fea3e53e47ab1f58fa2a24a65932167e8a1fe99754 languageName: node linkType: hard @@ -7886,7 +7874,7 @@ __metadata: "@walmart/redux-store": "npm:6.1.4" "@walmart/returns-mini-app": "npm:4.6.0" "@walmart/rfid-scan-mini-app": "npm:2.3.16" - "@walmart/rn-receiving-mini-app": "npm:2.2.140" + "@walmart/rn-receiving-mini-app": "npm:2.2.146" "@walmart/roster-mini-app": "npm:2.8.2" "@walmart/schedule-mini-app": "npm:0.118.0" "@walmart/shelfavailability-mini-app": "npm:1.5.26" @@ -18475,19 +18463,6 @@ __metadata: languageName: node linkType: hard -"react-native-snap-carousel@npm:>=4.0.0-beta.6": - version: 4.0.0-beta.6 - resolution: "react-native-snap-carousel@npm:4.0.0-beta.6" - dependencies: - "@types/react-addons-shallow-compare": "npm:^0.14.22" - react-addons-shallow-compare: "npm:15.6.2" - peerDependencies: - react: ">=16.0.0" - react-native: ">=0.58.0" - checksum: 10c0/70373671c916765057bac0c5ddae800b9b690bdc8efffd1dd403461565f7643897257a1d4199e6e6f3d22ba12face010070dea30a394ffa40411c0f9b5e98fe7 - languageName: node - linkType: hard - "react-native-sound-player@npm:0.13.2": version: 0.13.2 resolution: "react-native-sound-player@npm:0.13.2"
Resolved merge conflicts
Resolved merge conflicts
b6b74b4321f48000ce21009c6aacf7aa8610d952
--- package-lock.json @@ -39,7 +39,7 @@ "@walmart/attendance-mini-app": "0.190.2", "@walmart/compass-sdk-rn": "4.0.0", "@walmart/config-components": "4.1.0-rc.4", - "@walmart/copilot-mini-app": "^1.77.0", + "@walmart/copilot-mini-app": "1.77.1", "@walmart/core-services": "~2.0.19", "@walmart/core-services-allspark": "~2.11.0", "@walmart/core-utils": "~2.0.5", @@ -4935,9 +4935,9 @@ } }, "node_modules/@walmart/copilot-mini-app": { - "version": "1.77.0", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.77.0.tgz", - "integrity": "sha512-KhBE7CFDMfajMAMSK4XQZmM4TjiYMfOipwRcJVmYHuflZoL4n6/ost/RhFby8XpYfb0jzhMdv1rbEfSc+EYcjg==", + "version": "1.77.1", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.77.1.tgz", + "integrity": "sha512-rWDMGBZfMPj9kgUTdW5bS24Gs4Bf1gIBleM/JlNwMTU5V9zu3UcYBV84EQX0cxSyBVPF7vUSNlejR9QMCGys5A==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -25130,9 +25130,9 @@ } }, "@walmart/copilot-mini-app": { - "version": "1.77.0", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.77.0.tgz", - "integrity": "sha512-KhBE7CFDMfajMAMSK4XQZmM4TjiYMfOipwRcJVmYHuflZoL4n6/ost/RhFby8XpYfb0jzhMdv1rbEfSc+EYcjg==" + "version": "1.77.1", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.77.1.tgz", + "integrity": "sha512-rWDMGBZfMPj9kgUTdW5bS24Gs4Bf1gIBleM/JlNwMTU5V9zu3UcYBV84EQX0cxSyBVPF7vUSNlejR9QMCGys5A==" }, "@walmart/core-services": { "version": "2.0.19", --- package.json @@ -81,7 +81,7 @@ "@walmart/attendance-mini-app": "0.190.2", "@walmart/compass-sdk-rn": "4.0.0", "@walmart/config-components": "4.1.0-rc.4", - "@walmart/copilot-mini-app": "1.77.0", + "@walmart/copilot-mini-app": "1.77.1", "@walmart/core-services": "~2.0.19", "@walmart/core-services-allspark": "~2.11.0", "@walmart/core-utils": "~2.0.5",
chore: bump copilot 1.77.1
chore: bump copilot 1.77.1
9e0a8852623b28662d70179f82517da087474415
--- src/navigation/components.tsx @@ -48,6 +48,7 @@ export const LivingDesignTabBar = (props: MaterialTopTabBarProps) => { }; return ( + //@ts-ignore <TabNavigationItem isCurrent={isFocused} onPress={onPress} --- src/navigation/components.tsx @@ -48,6 +48,7 @@ export const LivingDesignTabBar = (props: MaterialTopTabBarProps) => { }; return ( + //@ts-ignore <TabNavigationItem isCurrent={isFocused} onPress={onPress}
fixing TypeScript Errors by ignoring
fixing TypeScript Errors by ignoring
225ad281b952e6c18fbc5dcb8f09fb493b967547
--- targets/US/package.json @@ -146,7 +146,7 @@ "@walmart/shelfavailability-mini-app": "1.5.33", "@walmart/sidekick-mini-app": "4.67.15", "@walmart/store-feature-orders": "1.26.12", - "@walmart/taskit-mini-app": "4.16.0", + "@walmart/taskit-mini-app": "4.17.1", "@walmart/time-clock-mini-app": "2.400.0", "@walmart/topstock-mini-app": "1.15.20", "@walmart/ui-components": "patch:@walmart/ui-components@patch%3A@walmart/ui-components@npm%253A1.16.1%23~/.yarn/patches/@walmart-ui-components-npm-1.16.1-c240fb0151.patch%3A%3Aversion=1.16.1&hash=79c828#~/.yarn/patches/@walmart-ui-components-patch-cd5ae6f92c.patch", --- yarn.lock @@ -6872,7 +6872,7 @@ __metadata: "@walmart/shelfavailability-mini-app": "npm:1.5.33" "@walmart/sidekick-mini-app": "npm:4.67.15" "@walmart/store-feature-orders": "npm:1.26.12" - "@walmart/taskit-mini-app": "npm:4.16.0" + "@walmart/taskit-mini-app": "npm:4.17.1" "@walmart/time-clock-mini-app": "npm:2.400.0" "@walmart/topstock-mini-app": "npm:1.15.20" "@walmart/ui-components": "patch:@walmart/ui-components@patch%3A@walmart/ui-components@npm%253A1.16.1%23~/.yarn/patches/@walmart-ui-components-npm-1.16.1-c240fb0151.patch%3A%3Aversion=1.16.1&hash=79c828#~/.yarn/patches/@walmart-ui-components-patch-cd5ae6f92c.patch" @@ -7776,12 +7776,12 @@ __metadata: languageName: node linkType: hard -"@walmart/taskit-mini-app@npm:4.16.0": - version: 4.16.0 - resolution: "@walmart/taskit-mini-app@npm:4.16.0" +"@walmart/taskit-mini-app@npm:4.17.1": + version: 4.17.1 + resolution: "@walmart/taskit-mini-app@npm:4.17.1" peerDependencies: "@walmart/allspark-foundation": "*" - checksum: 10c0/6fef5d7f0d8e8b19948b9251fa3dfa3092e3fe323d31ab6b66c86f529763eae7a6ec222fdb50aef7ae1b58d5b913c20c0c0d46eab6c7d72dd97c1f319b18be7c + checksum: 10c0/0796ee32e779b03d7028165223d5d71401fec031ee2efc75f2b9580bfe273cc7ddbf080d09b35b5a116a7bf93ce4bfc815b62bc65de2102ac26e0bc5991811c4 languageName: node linkType: hard
updated taskit version
updated taskit version
b61dfa7522fd2047cf9766270bdfd95757b3186e
--- android/app/build.gradle @@ -158,9 +158,8 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - multiDexEnabled true - versionCode 908 - versionName "1.11.0" + versionCode 909 + versionName "1.11.1" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { // We configure the CMake build only if you decide to opt-in for the New Architecture. --- ios/AllSpark/Info.plist @@ -19,7 +19,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.11.0</string> + <string>1.11.1</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key>
Android and IOS version update
Android and IOS version update
583c4cd72c03178b53912829d5b2e2134a77280f
--- docs/docs/components/allspark foundation/services/foundation-logger.md @@ -115,3 +115,47 @@ import { useContainerService } from '@walmart/allspark-foundation/Container'; const LoggerService = useContainerService('logger'); ``` + +## Logger Service API +### `setLogLevel()` +Sets the log level for the logger. + +```ts +const FeatureLogger = LoggerService.createFeatureInstance('feature-name'); +FeatureLogger.setLogLevel('info'); +``` + +### `debug()` +Logs a debug message. + +```ts +const FeatureLogger = LoggerService.createFeatureInstance('feature-name'); +FeatureLogger.debug('message', ..params); +``` + +### `info()` +Logs an informational message. + +```ts +const FeatureLogger = LoggerService.createFeatureInstance('feature-name'); +FeatureLogger.info('message', ..params); +``` + +### `warn()` +Logs a warning message. + +```ts +const FeatureLogger = LoggerService.createFeatureInstance('feature-name'); +FeatureLogger.warn('message', ..params); +``` + +### `error()` +Logs an error message. + +```ts +const FeatureLogger = LoggerService.createFeatureInstance('feature-name'); +FeatureLogger.error('message', ..params); +``` + +### `configure()` +Configures the logger with the specified configuration. \ No newline at end of file
Logger service API example code.
Logger service API example code.
e62da49e24cf6a2f59c82ab0c3ddc06588e395fb
--- packages/allspark-foundation/src/Translation/modals/ChangeLanguageModal.tsx @@ -55,8 +55,7 @@ export const ChangeLanguageModalComponent = () => { } checked={i18n.language === language} onPress={() => onChangeLanguage(language)} - // eslint-disable-next-line react-native/no-inline-styles - UNSAFE_style={{ marginBottom: 16 }} + UNSAFE_style={styles.radioButton} /> ))} </SafeAreaView>
chore: fix style usage
chore: fix style usage
90afa0d6ad27fc6a656489f8c025c56b04c66aef
--- src/ccmFallbacks.ts @@ -4,4 +4,7 @@ export const CCMFallbacks = { 'https://www.walmartethics.com/content/walmartethics/en_us/code-of-conduct.html', enableMessageButton: true, pushToTalkEnabled: false, + shouldDisplayWarningBanner: false, + warningMessageContent: + 'Look for changes to Me@ in August. The texting feature will be improved and push to talk will be removed temporarily for updates.', }; --- src/containers/WarningBanner.tsx @@ -0,0 +1,25 @@ +import React, {useState} from 'react'; +import {Text} from 'react-native'; +import {Banner} from '@walmart/gtp-shared-components'; +import {TEXTING_I18N_NAMESPACE} from '../translations'; +import {useTranslation} from 'react-i18next'; +import {useSelector} from 'react-redux'; +import { + shouldDisplayWarningBanner, + warningMessageContent, +} from '../redux/selectors'; + +export const WarningBanner = () => { + const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); + const [dismissBanner, setDismissBanner] = useState(false); + const showWarningBanner = useSelector(shouldDisplayWarningBanner); + const messageContent = useSelector(warningMessageContent); + const onDismissBanner = () => setDismissBanner(true); + return showWarningBanner && !dismissBanner ? ( + <Banner variant='warning' onClose={onDismissBanner}> + <Text>{t(messageContent.toString() || '')}</Text> + </Banner> + ) : ( + <></> + ); +}; --- src/redux/selectors.ts @@ -66,3 +66,15 @@ export const teamLeadJobDescriptions = createSelector( } }, ); + +export const shouldDisplayWarningBanner = createSelector( + [getTextingAppConfigData], + (state) => + state?.shouldDisplayWarningBanner ?? + CCMFallbacks.shouldDisplayWarningBanner, +); + +export const warningMessageContent = createSelector( + [getTextingAppConfigData], + (state) => state?.warningMessageContent ?? CCMFallbacks.warningMessageContent, +); --- src/screens/TabsScreen.tsx @@ -10,6 +10,7 @@ import {ChannelsScreen} from './ChannelsScreen'; import {UnreadBadge} from '../channels/components'; import {useTranslation} from 'react-i18next'; import {TEXTING_I18N_NAMESPACE} from '../translations'; +import {WarningBanner} from '../containers/WarningBanner'; type TabsScreenProps = { navigation: StackNavigationProp<TextingNavParamsMap, 'myTeam.tabs'>; @@ -22,6 +23,7 @@ export const TabsScreen: React.FC<TabsScreenProps> = () => { return ( <> + <WarningBanner /> <UserHeader /> <MainTab.Navigator --- src/ccmFallbacks.ts @@ -4,4 +4,7 @@ export const CCMFallbacks = { 'https://www.walmartethics.com/content/walmartethics/en_us/code-of-conduct.html', enableMessageButton: true, pushToTalkEnabled: false, + shouldDisplayWarningBanner: false, + warningMessageContent: + 'Look for changes to Me@ in August. The texting feature will be improved and push to talk will be removed temporarily for updates.', }; --- src/containers/WarningBanner.tsx @@ -0,0 +1,25 @@ +import React, {useState} from 'react'; +import {Text} from 'react-native'; +import {Banner} from '@walmart/gtp-shared-components'; +import {TEXTING_I18N_NAMESPACE} from '../translations'; +import {useTranslation} from 'react-i18next'; +import {useSelector} from 'react-redux'; +import { + shouldDisplayWarningBanner, + warningMessageContent, +} from '../redux/selectors'; + +export const WarningBanner = () => { + const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); + const [dismissBanner, setDismissBanner] = useState(false); + const showWarningBanner = useSelector(shouldDisplayWarningBanner); + const messageContent = useSelector(warningMessageContent); + const onDismissBanner = () => setDismissBanner(true); + return showWarningBanner && !dismissBanner ? ( + <Banner variant='warning' onClose={onDismissBanner}> + <Text>{t(messageContent.toString() || '')}</Text> + </Banner> + ) : ( + <></> + ); +}; --- src/redux/selectors.ts @@ -66,3 +66,15 @@ export const teamLeadJobDescriptions = createSelector( } }, ); + +export const shouldDisplayWarningBanner = createSelector( + [getTextingAppConfigData], + (state) => + state?.shouldDisplayWarningBanner ?? + CCMFallbacks.shouldDisplayWarningBanner, +); + +export const warningMessageContent = createSelector( + [getTextingAppConfigData], + (state) => state?.warningMessageContent ?? CCMFallbacks.warningMessageContent, +); --- src/screens/TabsScreen.tsx @@ -10,6 +10,7 @@ import {ChannelsScreen} from './ChannelsScreen'; import {UnreadBadge} from '../channels/components'; import {useTranslation} from 'react-i18next'; import {TEXTING_I18N_NAMESPACE} from '../translations'; +import {WarningBanner} from '../containers/WarningBanner'; type TabsScreenProps = { navigation: StackNavigationProp<TextingNavParamsMap, 'myTeam.tabs'>; @@ -22,6 +23,7 @@ export const TabsScreen: React.FC<TabsScreenProps> = () => { return ( <> + <WarningBanner /> <UserHeader /> <MainTab.Navigator
add message banner for Drop 13 updates on texting mini app and ccm config changes
add message banner for Drop 13 updates on texting mini app and ccm config changes
af46cef4eeb4bcd34431d12ccb4fad3c137443b3
--- package.json @@ -112,7 +112,7 @@ "@walmart/ims-print-services-ui": "2.11.3", "@walmart/inbox-mini-app": "0.94.6", "@walmart/iteminfo-mini-app": "7.13.2", - "@walmart/learning-mini-app": "20.0.25", + "@walmart/learning-mini-app": "20.0.26", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-at-walmart-athena-queries": "6.1.4", "@walmart/me-at-walmart-common": "6.1.4", --- yarn.lock @@ -6341,9 +6341,9 @@ __metadata: languageName: node linkType: hard -"@walmart/learning-mini-app@npm:20.0.23": - version: 20.0.23 - resolution: "@walmart/learning-mini-app@npm:20.0.23" +"@walmart/learning-mini-app@npm:20.0.26": + version: 20.0.26 + resolution: "@walmart/learning-mini-app@npm:20.0.26" peerDependencies: "@atmt/feedback-component-native": ^8.0.0 "@react-native-firebase/analytics": 17.4.2 @@ -6417,7 +6417,7 @@ __metadata: reduxsauce: ^1.2.0 reselect: ^4.0.0 wifi-store-locator: ^1.0.0-alpha2 - checksum: 10c0/ef5aa940d4375dcc971516c07a147b7f6fa872228f98711a91f8f8b2be83a64ccf08aea3e395972dac6bc3c977e4cdb7c14b67e388abab84216c5c02131e61e4 + checksum: 10c0/34f943db382194953081c738b448bd2f9e126e2ab56f55ae26ef4ba2c9e39d793c05f6b03bb80772836c12d38f86cf449acb75dffed32544d2e2c10bede2f4ad languageName: node linkType: hard @@ -7729,7 +7729,7 @@ __metadata: "@walmart/ims-print-services-ui": "npm:2.11.3" "@walmart/inbox-mini-app": "npm:0.94.6" "@walmart/iteminfo-mini-app": "npm:7.13.2" - "@walmart/learning-mini-app": "npm:20.0.23" + "@walmart/learning-mini-app": "npm:20.0.26" "@walmart/manager-approvals-miniapp": "npm:0.2.4" "@walmart/me-at-walmart-athena-queries": "npm:6.1.4" "@walmart/me-at-walmart-common": "npm:6.1.4"
feat: :sparkles: Bump learning mini app version to 20.0.26
feat: :sparkles: Bump learning mini app version to 20.0.26
06c036d73c503aab346861f687abb1d81d803ade
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.15.36", + "version": "1.15.37", "main": "dist/index.js", "files": [ "dist" @@ -81,7 +81,7 @@ "@typescript-eslint/parser": "^5.37.0", "@walmart/allspark-authentication": "6.1.4", "@walmart/allspark-foundation": "6.20.0", - "@walmart/allspark-foundation-hub": "1.2.7-alpha.9", + "@walmart/allspark-foundation-hub": "1.2.7-alpha.10", "@walmart/allspark-graphql-client": "^1.4.6", "@walmart/allspark-http-client": "6.1.4", "@walmart/config-components": "4.4.0", @@ -99,7 +99,7 @@ "@walmart/react-native-shared-navigation": "6.1.4", "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "3.7.0", - "@walmart/roster-mini-app": "2.12.38", + "@walmart/roster-mini-app": "2.12.39", "@walmart/ui-components": "1.15.1", "babel-jest": "^29.2.1", "chance": "^1.1.11", --- yarn.lock @@ -5992,9 +5992,9 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-foundation-hub@npm:1.2.7-alpha.9": - version: 1.2.7-alpha.9 - resolution: "@walmart/allspark-foundation-hub@npm:1.2.7-alpha.9" +"@walmart/allspark-foundation-hub@npm:1.2.7-alpha.10": + version: 1.2.7-alpha.10 + resolution: "@walmart/allspark-foundation-hub@npm:1.2.7-alpha.10" dependencies: "@reduxjs/toolkit": "npm:^1.9.7" "@shopify/flash-list": "npm:~1.6.4" @@ -6010,7 +6010,7 @@ __metadata: react: "*" react-native: "*" react-native-safe-area-context: 4.x - checksum: 10c0/51bcfe78e4e1a0742d9305a31aba8464b5f2cb78deb4b86ebd979ee04f4e004a8728eff00424dd6b7819fda883ee4191d0cf45773d908ffe5180ef4a4a5249cc + checksum: 10c0/1ad8d14ffd7f721a53e638b91f4557fd2160c029d2600f434377cc2b21ddc35d1d3621726429325def628ed3a81c2caf919a55bf3601f7cf37b5183dd6b72695 languageName: node linkType: hard @@ -6398,7 +6398,7 @@ __metadata: "@typescript-eslint/parser": "npm:^5.37.0" "@walmart/allspark-authentication": "npm:6.1.4" "@walmart/allspark-foundation": "npm:6.20.0" - "@walmart/allspark-foundation-hub": "npm:1.2.7-alpha.9" + "@walmart/allspark-foundation-hub": "npm:1.2.7-alpha.10" "@walmart/allspark-graphql-client": "npm:^1.4.6" "@walmart/allspark-http-client": "npm:6.1.4" "@walmart/config-components": "npm:4.4.0" @@ -6416,7 +6416,7 @@ __metadata: "@walmart/react-native-shared-navigation": "npm:6.1.4" "@walmart/react-native-sumo-sdk": "npm:2.6.0" "@walmart/redux-store": "npm:3.7.0" - "@walmart/roster-mini-app": "npm:2.12.38" + "@walmart/roster-mini-app": "npm:2.12.39" "@walmart/ui-components": "npm:1.15.1" babel-jest: "npm:^29.2.1" chance: "npm:^1.1.11" @@ -6597,9 +6597,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:2.12.38": - version: 2.12.38 - resolution: "@walmart/roster-mini-app@npm:2.12.38" +"@walmart/roster-mini-app@npm:2.12.39": + version: 2.12.39 + resolution: "@walmart/roster-mini-app@npm:2.12.39" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6641,7 +6641,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/333b8c53189a321bb575a21328b4986ffde422840352f5659a4c8e55ef3186db883e9344c0ab81bc41113a7ee5203401f742b5d2a7dc7138ca6f2b1bf07fdab8 + checksum: 10c0/2379bf04a0a92d779b373d5078f58af1a0b2380693880aa8bafb0a37979678d8159a44957cbbefb0d45d92c85c45979e1ce68ff8801040d79cccfa6a69a76bae languageName: node linkType: hard
Update the roster mini app version
Update the roster mini app version
af6e912a422c3dab86687d7cac4434eee2556bac
--- .looper.yml @@ -72,6 +72,9 @@ flows: - call: sonar-fetch-remote-fix-ref - call: sonar + push: + - call: publishFromChanges + publishPatch: - call: preparePublish - (name Publish From Changes) HUSKY=0 npx lerna publish patch --yes --force-publish
chore: add looper push flow for automated publishing
chore: add looper push flow for automated publishing
dd4404cf3df4838e05455049e2737e94138aecc9
--- packages/allspark-foundation/src/Navigation/client.tsx @@ -450,6 +450,13 @@ export class NavigationClient< }; } + /** + * Returns true if a modal with the provided modalName exists. + */ + public hasModal = (modalName: string) => { + return !!this._modalStackConfig[modalName]; + }; + /** * Adds a modal component, by the provided modal name, to the modal stack. */
feat: add utility method to check if modal has been registered
feat: add utility method to check if modal has been registered
62b41b1dd3be683cd77bb72942d1412b5c1f5a0f
--- src/Translations/index.ts --- src/Translations/locales/en-US.json --- src/Translations/locales/es-MX.json
fix(translation): naming
fix(translation): naming
beb5258919b34a94b923d73d096cdf2a6abd54df
--- __tests__/__mocks__/@walmart/receipt-check-miniapp.js @@ -0,0 +1,10 @@ +import React from 'react'; + +jest.mock('@walmart/receipt-check-miniapp', () => { + return { + __esModule: true, + default: jest.fn(() => ({ + ReceiptCheckminiApp: <></>, + })), + }; +}); --- __tests__/navigation/AssociateHallwayNav/MainStackNavTest.tsx @@ -49,15 +49,6 @@ jest.mock('../../../src/navigation/AssociateHallwayNav/Tabs', () => ({ getTabsScreenOptions: () => ({}), })); -jest.mock('@walmart/receipt-check-miniapp', () => { - return { - __esModule: true, - default: jest.fn(() => ({ - ReceiptCheckminiApp: <></>, - })), - }; -}); - jest.mock('@walmart/me-field-mini-app', () => { return { __esModule: true,
added mocks to the receipt check miniapp
added mocks to the receipt check miniapp
78ff1f1f1f409b3e8e1614f803e6f2549b8407fd
--- package.json @@ -170,6 +170,7 @@ "expo-av": "~15.0.2", "expo-build-properties": "~0.13.2", "expo-constants": "~17.0.8", + "expo-file-system": "18.0.12", "expo-font": "~13.0.4", "expo-image": "patch:expo-image@npm%3A2.0.7#~/.yarn/patches/expo-image-npm-2.0.7-adb639d59c.patch", "expo-image-manipulator": "~12.0.5", --- yarn.lock @@ -8652,6 +8652,7 @@ __metadata: expo-build-properties: "npm:~0.13.2" expo-constants: "npm:~17.0.8" expo-doctor: "npm:^1.10.1" + expo-file-system: "npm:18.0.12" expo-font: "npm:~13.0.4" expo-image: "patch:expo-image@npm%3A2.0.7#~/.yarn/patches/expo-image-npm-2.0.7-adb639d59c.patch" expo-image-manipulator: "npm:~12.0.5" @@ -13905,7 +13906,7 @@ __metadata: languageName: node linkType: hard -"expo-file-system@npm:~18.0.12": +"expo-file-system@npm:18.0.12, expo-file-system@npm:~18.0.12": version: 18.0.12 resolution: "expo-file-system@npm:18.0.12::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fexpo-file-system%2F-%2Fexpo-file-system-18.0.12.tgz" dependencies:
chore(ui): ALLSPARK-5732 native-fs migrated to expo-file-system (#4243)
chore(ui): ALLSPARK-5732 native-fs migrated to expo-file-system (#4243) Co-authored-by: Maksym Novakh <maksym.novakh@walmart.com>
a5775512352c93fb8fd2af9c810df84f84b99fa5
--- README.md @@ -47,6 +47,10 @@ Foundational library for Me@Walmart mini apps. Common Me@Walmart widget registries. +#### [@walmart/me-at-walmart-athena-queries](https://gecgithub01.walmart.com/allspark/allspark/tree/main/packages/me-at-walmart-athena-queries) + +Athena queries for Me@Walmart related packages. + <br> ## Core Services
Update README.md
Update README.md
5384c5b854c478c44388f414cff61eafd4dde26c
--- packages/allspark-foundation/__tests__/Container/__snapshots__/AllspartContainer.test.tsx.snap @@ -1,9 +1,3 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`AllsparkContainer renders the Provider component and triggers the root setup 1`] = ` -[ - " ", - <LivingDesignProvider />, - " ", -] -`; +exports[`AllsparkContainer renders the Provider component and triggers the root setup 1`] = `<LivingDesignProvider />`; --- packages/allspark-foundation/src/Work/redux.ts @@ -46,15 +46,10 @@ export const { ActionTypes, ActionCreators } = */ export const WorkActionTypes = ActionTypes; - -// ******************************************************** -// REMOVE COMMENT: FIX documentation for WORK_FLOW_START() -// REMOVE COMMENT: WORK_FLOW_START() should accept an argument -// ******************************************************** /** * Action creators for work actions. * @example - * dispatch(WorkActions.WORK_FLOW_START()); + * dispatch(WorkActions.WORK_FLOW_COMPLETE()); */ export const WorkActions = ActionCreators;
feat: revert snap DWORK-6097
feat: revert snap DWORK-6097
3198241c0f5707ec68c1359e016669b57b8fad84
--- package.json @@ -180,7 +180,7 @@ "@walmart/time-clock-feature-app": "1.0.0", "@walmart/time-clock-mini-app": "patch:@walmart/time-clock-mini-app@npm%3A3.19.13#~/.yarn/patches/@walmart-time-clock-mini-app-npm-3.19.13-d3039974f6.patch", "@walmart/timesheet-feature-app": "0.2.0", - "@walmart/topstock-mini-app": "1.28.16", + "@walmart/topstock-mini-app": "1.28.18", "@walmart/translator-mini-app": "1.8.14", "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.27.4#~/.yarn/patches/@walmart-ui-components-npm-1.27.4-f17d3c535e.patch", "@walmart/walmart-fiscal-week": "^0.3.6", --- yarn.lock @@ -8949,7 +8949,7 @@ __metadata: "@walmart/time-clock-feature-app": "npm:1.0.0" "@walmart/time-clock-mini-app": "patch:@walmart/time-clock-mini-app@npm%3A3.19.13#~/.yarn/patches/@walmart-time-clock-mini-app-npm-3.19.13-d3039974f6.patch" "@walmart/timesheet-feature-app": "npm:0.2.0" - "@walmart/topstock-mini-app": "npm:1.28.16" + "@walmart/topstock-mini-app": "npm:1.28.18" "@walmart/translator-mini-app": "npm:1.8.14" "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.27.4#~/.yarn/patches/@walmart-ui-components-npm-1.27.4-f17d3c535e.patch" "@walmart/walmart-fiscal-week": "npm:^0.3.6" @@ -10142,9 +10142,9 @@ __metadata: languageName: node linkType: hard -"@walmart/topstock-mini-app@npm:1.28.16": - version: 1.28.16 - resolution: "@walmart/topstock-mini-app@npm:1.28.16::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ftopstock-mini-app%2F-%2F%40walmart%2Ftopstock-mini-app-1.28.16.tgz" +"@walmart/topstock-mini-app@npm:1.28.18": + version: 1.28.18 + resolution: "@walmart/topstock-mini-app@npm:1.28.18::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ftopstock-mini-app%2F-%2F%40walmart%2Ftopstock-mini-app-1.28.18.tgz" peerDependencies: "@react-navigation/native": ">=5.8.10" "@react-navigation/stack": ">=5.12.8" @@ -10155,7 +10155,7 @@ __metadata: react-i18next: ">=11.7.3" react-native-vector-icons: ">=6.6.0" react-redux: ">=7.2.0" - checksum: 10c0/5fc5883711af4594f0fa4e088cdaab0026e3ffdfb2ae08816c81bb00a953cb51eb3e57e0f689bbf3bb4b232a4438456b3f0b2cfea89bb5f373d75cd6d91d24c2 + checksum: 10c0/8cf4a20f8243644d6d6e0828596794987fe8883e87fa92694e36b55af2122c163ccbf5adc83c45c307a7cfdab03da110d6135be62013332ddfec9fdf6f12d99f languageName: node linkType: hard
fix: updating topstock (#5295)
fix: updating topstock (#5295) Co-authored-by: t0s0qvk <t0s0qvk@walmart.com> Co-authored-by: Vishesh Hiremath - v0h00hj <Vishesh.Hiremath@walmart.com> Co-authored-by: Hariharan Sundaram <hariharan.sundaram0@walmart.com> Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com> Co-authored-by: Talia Andrews - t0a07tn <Talia.Andrews@walmart.com> Co-authored-by: Hariharan Sundaram <121838+h0s0em0@users.noreply.gecgithub01.walmart.com>
456a102bc293fd8879aaeee83c042278cb1ea9a5
--- packages/allspark-foundation/src/Translation/types.ts @@ -24,7 +24,7 @@ export type TranslationOptions = TOptions; * A translation resource for a particular feature and language */ export type FeatureTranslationResource = { - [key: string]: string | { [key: string]: string }; + [key: string]: string | FeatureTranslationResource; }; /**
fix: typing for translation resource only allowed one level of nesting
fix: typing for translation resource only allowed one level of nesting
90b0ab68108b03d0092f48cd0d30f8d0d9393ab0
--- package-lock.json @@ -3483,22 +3483,22 @@ "integrity": "sha512-bRj8dBPIo3ShYDH800Lm9XfbCHk8Kclu+Cqbdo/oEB3DIQtoK4TSoyIm8W+c9nhd/kaeEQsev6N99WmNj5BEAg==" }, "@walmart/schedule-mini-app": { - "version": "0.2.82", - "resolved": "https://npme.walmart.com/@walmart/schedule-mini-app/-/schedule-mini-app-0.2.82.tgz", - "integrity": "sha512-Xf/6Wm/owpK10QtTJ5ciAceTt/AoPcFhA/01a6EY42HycwbuPl+BQs6mQ9lmtQx5XDaBaPoBgAwzazBWF8ZsAA==", + "version": "0.3.0", + "resolved": "https://npme.walmart.com/@walmart/schedule-mini-app/-/schedule-mini-app-0.3.0.tgz", + "integrity": "sha512-oeuIR4tNfpdgccpEexd5I09RQiwfxsGsMnqfnA3Q6Du3KiBe9xYFY+fte0bWvfe40m8ZftJCjJNfB2C4v/qObQ==", "requires": { "@walmart/moment-walmart": "^1.0.4", "@walmart/wfm-ui": "0.1.52", "crypto-js": "^3.3.0", "react-native-tab-view": "^2.15.2", "reselect": "^4.0.0", - "wfm-allspark-data-library": "0.0.25" + "wfm-allspark-data-library": "0.1.1" }, "dependencies": { "@walmart/gtp-shared-components": { "version": "0.2.8", "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-0.2.8.tgz", - "integrity": "sha512-IA9N+V22Gh1T2Xvu04R3jQ5XiTmSuLxbqwJUT3bYyg6h78Rm1+ku7HKQEugh4C9iS2uudqcX8b4nfd1K+nc05g==", + "integrity": "sha1-WVNyJulWijS1uVBqYJu6kl7lLEA=", "requires": { "@react-native-community/datetimepicker": "^3.0.8", "@react-native-community/picker": "^1.6.5", @@ -3509,7 +3509,7 @@ "@walmart/wfm-ui": { "version": "0.1.52", "resolved": "https://npme.walmart.com/@walmart/wfm-ui/-/wfm-ui-0.1.52.tgz", - "integrity": "sha512-P1CRQO9OCXk+T+5163EM7Mpuvx5yJx+8QIZJO1j2YJXBzBTgE5gvGglXVrKq/KKKr9E1B5hhVl9Bf6vJvrO7Vg==", + "integrity": "sha1-vsuqaggfL5L/KFXHCYIRDlZL5X0=", "requires": { "@walmart/gtp-shared-components": "^0.2.2", "@walmart/moment-walmart": "1.0.3", @@ -3526,14 +3526,14 @@ "@walmart/moment-walmart": { "version": "1.0.3", "resolved": "https://npme.walmart.com/@walmart/moment-walmart/-/moment-walmart-1.0.3.tgz", - "integrity": "sha512-rq1NYboOSqlXtiorH3m+8FwaInZ9X6epZpecrf9IjPmxvsXWbCcFxjybtqcPhux6FzcViIUWsJ3gnZBhYls8rA==" + "integrity": "sha1-JYhQmoi+ylQ/z6jdXhGZncmaYGQ=" } } }, "wfm-allspark-data-library": { - "version": "0.0.25", - "resolved": "https://npme.walmart.com/wfm-allspark-data-library/-/wfm-allspark-data-library-0.0.25.tgz", - "integrity": "sha512-FM4WiVXwR/dvp6/zGcrf7zCHbSVf3hUzuSSlkUjMiWj9eQmrsH3tqLzOkJfdW7s/ZsfprE9CmqWb3yhHDl3UaA==", + "version": "0.1.1", + "resolved": "https://npme.walmart.com/wfm-allspark-data-library/-/wfm-allspark-data-library-0.1.1.tgz", + "integrity": "sha512-QjuPCB54P6j+bV3CG1D4l96DRDqQXichOrTQtRoYNXQWvYZpMsVQOkZhfxIqOOCJTLTWlwJih8wGpJmBp53cZw==", "requires": { "azure-storage": "2.10.3", "crypto-js": "^3.3.0", --- package.json @@ -93,7 +93,7 @@ "@walmart/react-native-shared-navigation": "^0.4.0", "@walmart/react-native-sumo-sdk": "^2.0.0-beta-6", "@walmart/redux-store": "^1.0.15", - "@walmart/schedule-mini-app": "0.2.82", + "@walmart/schedule-mini-app": "0.3.0", "@walmart/settings-mini-app": "1.3.7", "@walmart/shelfavailability-mini-app": "0.3.78", "@walmart/time-clock-mini-app": "0.4.6",
Bumping schedule-mini-app
Bumping schedule-mini-app
3ca61cb35cc2d3e8835fa084602db755f2212d96
--- packages/celebration-mini-app/src/config/appConfig.ts @@ -23,17 +23,17 @@ const PROD_URLS = { export type CelebrationUrls = typeof DEV_URLS | typeof PROD_URLS; const getAppVariant = () => { - return process.env.EXPO_PUBLIC_APP_VARIANT || 'prod'; + return process.env.EXPO_PUBLIC_APP_VARIANT || 'dev'; }; export const DefaultCelebrationConfig = (() => { const variant = getAppVariant(); switch (variant) { + case 'prod': + return {externalRouteConfig: PROD_URLS}; case 'dev': case 'teflon': - return {externalRouteConfig: DEV_URLS}; - case 'prod': default: - return {externalRouteConfig: PROD_URLS}; + return {externalRouteConfig: DEV_URLS}; } })();
feat(ui): updated config var
feat(ui): updated config var
3b7eb6bed3203093f4d97fc6c064e34e9b01160d
--- packages/allspark-foundation-hub/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.16.0](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.15.0...@walmart/allspark-foundation-hub@1.16.0) (2025-09-25) + +### Features + +- **ui:** reverted some optimization changes that introduced some bugs ([#400](https://gecgithub01.walmart.com/allspark/allspark/issues/400)) ([613f9f7](https://gecgithub01.walmart.com/allspark/allspark/commit/613f9f74e4992e493d72884c78e767682e23811a)) + # [1.15.0](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.14.7...@walmart/allspark-foundation-hub@1.15.0) (2025-09-23) ### Features --- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.15.0", + "version": "1.16.0", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts",
chore(version): updating package version
chore(version): updating package version - @walmart/allspark-foundation-hub@1.16.0
6c99b1c73584c1fc29cc6f86fced5c64f8c031c2
--- ios/AllSpark.xcodeproj/project.pbxproj @@ -536,7 +536,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = D994751F557438D6B85DBCC2 /* Pods-AllSpark.debug.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Dev"; + ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Beta"; CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = AllSpark/AllSpark.entitlements; @@ -582,7 +582,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 99D7C873A014A98046591001 /* Pods-AllSpark.release.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Dev"; + ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Beta"; CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = AllSpark/AllSpark.entitlements; --- ios/AllSpark/Info.plist @@ -109,7 +109,7 @@ <string>remote-notification</string> </array> <key>UILaunchStoryboardName</key> - <string>LaunchScreen-Dev</string> + <string>LaunchScreen-Beta</string> <key>UIRequiredDeviceCapabilities</key> <array> <string>armv7</string> --- src/home/components/TaskCard/TaskClockStatusTeamCard2.tsx @@ -66,6 +66,7 @@ export const TaskClockStatusTeamCard2: FC<TaskCardProps> = (props) => { // team name in image file & translation file is same and w/o any whitespace or special character. // Replace everything(' ' , '/', etc) but alphabets to make it one word const teamImage = teamName?.replace(/[^a-zA-Z]/g, ''); + console.log('ruh teamImage', teamImage); let teamDisplayText = `Store #${storeId}`; if (teamName) { teamDisplayText = --- src/home/components/TaskCard/index.tsx @@ -33,7 +33,7 @@ export const TaskCard: FC<TaskCardProps> = (props) => { const showTaskClockStatus = useHomeAppConfig('showTaskClockStatus', true); const tmsVersion = useHomeAppConfig('tmsVersion', TMS_VERSION_2); - return isClockedIn ? ( + return true ? ( <View style={[styles.container, style]} testID='taskCard'> <Headline style={styles.titleText}> {t('teams.teamTaskTitle', {context})} --- src/images/assets/index.ts @@ -55,6 +55,7 @@ const Images: {[key: string]: ImageURISource} = { taskMeatProduce: require('./tasks/task-image-meatproduce.png'), taskPharmacy: require('./tasks/task-image-pharmacy.png'), taskRemodel: require('./tasks/task-image-remodel.png'), + taskSalesfloor: require('./tasks/task-image-basket.png'), taskSeasonal: require('./tasks/task-image-seasonal.png'), taskStocking: require('./tasks/task-image-stockingday.png'), taskStockingDay: require('./tasks/task-image-stockingday.png'), --- src/images/assets/tasks/task-image-basket.png Binary files /dev/null and b/src/images/assets/tasks/task-image-basket.png differ --- src/whatsNew/WhatsNewScreen.tsx @@ -24,6 +24,7 @@ import { } from './types'; import {BackgroundImage, WhatsNewScreenStyles as styles} from './styles'; import {renderWhatsNewItem, renderWhatsNewSection} from './utils'; +import {GlobalState, SiteSelectors} from '@walmart/redux-store'; const keyExtractor = (item: any, index: number) => String(index); @@ -51,7 +52,12 @@ export const EmptyState = () => { export const WhatsNewScreen = () => { const [translate] = useTranslation('common'); - const {whatsNew, whatsNext, restrictions, version} = useSelector(getWhatsNew); + const {whatsNew, whatsNext, restrictions, version} = useSelector( + (state: GlobalState) => { + const isDC = SiteSelectors.isSiteDistributionCenter(state); + return getWhatsNew(state, isDC); + }, + ); const renderSectionList = version === '2'; return (
fix: fixing selector for what's new in whatsNewScreen and adding image for Salesfloor
fix: fixing selector for what's new in whatsNewScreen and adding image for Salesfloor
dae8096fe0fe933662e39a73d9cfe6222501d290
--- .looper.multibranch.yml @@ -24,7 +24,7 @@ envs: ANDROID_BASE_PATH: targets/US/android branches: - - spec: feature/drop24 + - spec: feature/pc-drop24 triggers: - manual: name: Publish Packages (Pre-Release)
chore: updating PC version and Adding Manager Approval Migrations
chore: updating PC version and Adding Manager Approval Migrations
53a46f86de74b430d72270fc77a2bab513318faf
--- packages/allspark-foundation/__tests__/Components/SharedComponents.test.tsx @@ -0,0 +1,48 @@ +import React from 'react'; +import { render } from '@testing-library/react-native'; +import { Text } from 'react-native'; +import { AllsparkSharedComponents } from '../../src/Components/SharedComponents'; + + +describe('AllsparkSharedComponents', () => { + const manager = AllsparkSharedComponents as any; + let runEventListenerSpy: jest.SpyInstance; + runEventListenerSpy = jest.spyOn(manager._eventManager, 'runEventListener'); + beforeEach(() => { + manager._components = {}; + }); + + afterEach(() => { + runEventListenerSpy.mockRestore(); + }); + + it('should register a component', () => { + const TestComponent = ({ value }: { value: string }) => <Text>{value}</Text>; + const result = manager.register('TestComponent', TestComponent); + expect(result).toBe(undefined); + expect(manager._components['TestComponent']).toBe(TestComponent); + expect(manager._eventManager.runEventListener as jest.Mock).toHaveBeenCalledWith( + 'componentAdded', + 'TestComponent', + 'TestComponent' + ); + }); + + it('should not overwrite an existing component', () => { + const TestComponent = ({ value }: { value: string }) => <Text>{value}</Text>; + const result1 = manager.register('TestComponent', TestComponent); + expect(result1).toBe(undefined); + const AnotherComponent = ({ value }: { value: string }) => <Text>{value}</Text>; + const result2 = manager.register('TestComponent', AnotherComponent); + expect(result2).toBe(undefined); + expect(manager._components['TestComponent']).toBe(TestComponent); + }); + + it('should render the correct component with given props', () => { + const TestComponent = ({ value }: { value: string }) => <Text>{value}</Text>; + const result = manager.register('TestComponent', TestComponent); + expect(result).toBe(undefined); + const {getByText} = render(<manager.Component id="TestComponent" props={{ value: 'Hello World' }} />); + expect(getByText('Hello World')).toBeTruthy(); + }); + }); \ No newline at end of file
shared component unit test
shared component unit test
8b4fc815778f5d447772898828c38c02a9aa1dc4
--- docs/CHANGELOG.md @@ -1,3 +1,10 @@ +# [2.22.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.21.0...v2.22.0) (2025-04-04) + + +### Features + +* **ui:** update package js for roster ([f3cf534](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/f3cf53478472000b9545d8b0664ddf1518e3a441)) + # [2.21.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.20.0...v2.21.0) (2025-03-31) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.21.0", + "version": "2.22.0", "main": "dist/index.js", "files": [ "dist"
chore(release): 2.22.0 [skip ci]
chore(release): 2.22.0 [skip ci] # [2.22.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.21.0...v2.22.0) (2025-04-04) ### Features * **ui:** update package js for roster ([f3cf534](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/f3cf53478472000b9545d8b0664ddf1518e3a441))
15e358df8ee112a5353fd704338905c6a6c75eb6
--- __tests__/screens/RosterScreenTest.tsx @@ -1,9 +1,19 @@ // eslint-disable-next-line @typescript-eslint/no-unused-vars import React from 'react'; +import {render, screen, fireEvent} from '@testing-library/react-native'; +import {RosterScreen} from '../../src/screens/RosterScreen'; +import {useNavigation} from '@react-navigation/native'; describe('RosterScreen', () => { + //TODO: Add nav context pattern to test recipes it('should render the teams list', () => { - + const navigation = useNavigation(); + render( + <RosterScreen + navigation={navigation} + parentNavigation={navigation.getParent()} + />, + ); }); it('should render the associate list', () => {}); it('should render the weekly schedule header', () => {}); --- __tests__/setup.ts @@ -11,3 +11,12 @@ jest.mock('@walmart/functional-components', () => { mockHttpClient, }; }); + +// ------ React Navigator Related Mocks: https://reactnavigation.org/docs/testing/ ----- // +import 'react-native-gesture-handler/jestSetup'; +jest.mock('react-native-reanimated', () => { + const Reanimated = require('react-native-reanimated/mock'); + Reanimated.default.call = () => {}; + return Reanimated; +}); +jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper'); --- __tests__/screens/RosterScreenTest.tsx @@ -1,9 +1,19 @@ // eslint-disable-next-line @typescript-eslint/no-unused-vars import React from 'react'; +import {render, screen, fireEvent} from '@testing-library/react-native'; +import {RosterScreen} from '../../src/screens/RosterScreen'; +import {useNavigation} from '@react-navigation/native'; describe('RosterScreen', () => { + //TODO: Add nav context pattern to test recipes it('should render the teams list', () => { - + const navigation = useNavigation(); + render( + <RosterScreen + navigation={navigation} + parentNavigation={navigation.getParent()} + />, + ); }); it('should render the associate list', () => {}); it('should render the weekly schedule header', () => {}); --- __tests__/setup.ts @@ -11,3 +11,12 @@ jest.mock('@walmart/functional-components', () => { mockHttpClient, }; }); + +// ------ React Navigator Related Mocks: https://reactnavigation.org/docs/testing/ ----- // +import 'react-native-gesture-handler/jestSetup'; +jest.mock('react-native-reanimated', () => { + const Reanimated = require('react-native-reanimated/mock'); + Reanimated.default.call = () => {}; + return Reanimated; +}); +jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper');
working on mocking the navigator...
working on mocking the navigator...
9493e26c34b304dc5df3234c537d17f449a54132
--- jest.config.js @@ -6,7 +6,6 @@ module.exports = { collectCoverageFrom: [ '**/*.{ts,tsx}', '!**/*.d.ts', - '!**/index.{ts,tsx}', '!**/types.ts', '!**/*.types.ts', '!**/style.ts', --- packages/allspark-foundation-hub/src/Container/utils.ts @@ -43,7 +43,6 @@ const isValidWidget = (widget: any): boolean => { export const validateTeamWidgetMappingJson = (jsonInput: string): boolean => { try { const jsonMapping = JSON.parse(jsonInput); - console.log('Parsed JSON:', jsonMapping); // Debugging log if (!isObject(jsonMapping)) { console.error('Invalid JSON structure: Root is not an object'); --- packages/allspark-foundation/__tests__/FeatureRunner/screens/__snapshots__/Navigation.test.tsx.snap @@ -77,7 +77,7 @@ exports[`Navigation should render snapshot 1`] = ` } testID="ListItem-content" > - FALSE + TRUE </Text> </View> <View @@ -103,7 +103,7 @@ exports[`Navigation should render snapshot 1`] = ` accessibilityRole="image" source={ { - "testUri": "../../@walmart/gtp-shared-icons/assets/images/icons/LockOpen-32.png", + "testUri": "../../@walmart/gtp-shared-icons/assets/images/icons/Lock-32.png", } } style={ @@ -116,7 +116,7 @@ exports[`Navigation should render snapshot 1`] = ` {}, ] } - testID="LockOpenIcon" + testID="LockIcon" /> </IconButton> </View> --- packages/allspark-foundation/__tests__/Translation/modals/__snapshots__/ChangeLanguageModal.test.tsx.snap @@ -14,6 +14,18 @@ exports[`ChangeLanguageModal should render snapshot 1`] = ` "bottom", ] } - /> + > + <Radio + UNSAFE_style={ + { + "marginBottom": 16, + } + } + checked={false} + label="English (EN)" + onPress={[Function]} + testID="English (EN)" + /> + </SafeAreaView> </BottomSheet> `;
test(ui): update review comment on the tests
test(ui): update review comment on the tests
277e4dff78d04ce7cdd1bbac03fb75155a1b7f5c
--- src/navigation/types.ts @@ -8,6 +8,7 @@ export type TextingNavParamsMap = { FirebaseChannel >['path']; details?: NewChannelDetails; + autoPlayLatestAudio: boolean; }; 'texting.newMessage': undefined; 'texting.viewTeam': {teamId: string}; --- src/notification.ts @@ -13,12 +13,14 @@ export const onTextMessageNotification = (event?: SumoPushEvent) => { const rootContainerScreen = 'texting'; const appContainerRootScreen = 'texting.root'; const messagesScreen = 'texting.messages'; + + //TODO: conditionally set audio autoplay by checking for audio data in response payload navigate(rootContainerScreen, { // @ts-ignore screen: appContainerRootScreen, params: { screen: messagesScreen, - params: {channelPath: channelPath}, + params: {channelPath: channelPath, autoPlayLatestAudio: true}, }, }); handled = true; --- src/screens/MessagesScreen.tsx @@ -81,7 +81,11 @@ export type MessagesScreenProps = { export const MessagesScreen: FC<MessagesScreenProps> = (props) => { const {route} = props; const { - params: {channelPath, details = DEFAULT_DETAILS}, + params: { + channelPath, + details = DEFAULT_DETAILS, + autoPlayLatestAudio = false, + }, } = route; const {top} = useSafeAreaInsets(); @@ -174,10 +178,16 @@ export const MessagesScreen: FC<MessagesScreenProps> = (props) => { useEffect(() => { connectToChannel().then(startMessageSubscription); + if (autoPlayLatestAudio) { + console.log( + 'Do automatic playback of most recent message if it is an audio message', + ); + } + return () => { unsubscribeMessages.current?.(); }; - }, [channelPath]); + }, [channelPath, autoPlayLatestAudio]); // When scrolling to the top of the list, fetch the next set of messages const onEndReached = async () => { --- src/navigation/types.ts @@ -8,6 +8,7 @@ export type TextingNavParamsMap = { FirebaseChannel >['path']; details?: NewChannelDetails; + autoPlayLatestAudio: boolean; }; 'texting.newMessage': undefined; 'texting.viewTeam': {teamId: string}; --- src/notification.ts @@ -13,12 +13,14 @@ export const onTextMessageNotification = (event?: SumoPushEvent) => { const rootContainerScreen = 'texting'; const appContainerRootScreen = 'texting.root'; const messagesScreen = 'texting.messages'; + + //TODO: conditionally set audio autoplay by checking for audio data in response payload navigate(rootContainerScreen, { // @ts-ignore screen: appContainerRootScreen, params: { screen: messagesScreen, - params: {channelPath: channelPath}, + params: {channelPath: channelPath, autoPlayLatestAudio: true}, }, }); handled = true; --- src/screens/MessagesScreen.tsx @@ -81,7 +81,11 @@ export type MessagesScreenProps = { export const MessagesScreen: FC<MessagesScreenProps> = (props) => { const {route} = props; const { - params: {channelPath, details = DEFAULT_DETAILS}, + params: { + channelPath, + details = DEFAULT_DETAILS, + autoPlayLatestAudio = false, + }, } = route; const {top} = useSafeAreaInsets(); @@ -174,10 +178,16 @@ export const MessagesScreen: FC<MessagesScreenProps> = (props) => { useEffect(() => { connectToChannel().then(startMessageSubscription); + if (autoPlayLatestAudio) { + console.log( + 'Do automatic playback of most recent message if it is an audio message', + ); + } + return () => { unsubscribeMessages.current?.(); }; - }, [channelPath]); + }, [channelPath, autoPlayLatestAudio]); // When scrolling to the top of the list, fetch the next set of messages const onEndReached = async () => {
add logic to notice when message is an audio message to then play it
add logic to notice when message is an audio message to then play it
2128c554651b6bfbead63bd4980321043f8f1167
--- package.json @@ -72,7 +72,7 @@ "@walmart/gtp-shared-components": "^0.2.2", "@walmart/impersonation-mini-app": "1.0.15", "@walmart/inbox-mini-app": "0.0.92", - "@walmart/ItemInfo": "0.1.121", + "@walmart/ItemInfo": "0.1.123", "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.5.4", "@walmart/react-native-env": "^0.1.0",
iteminfo version upgrade
iteminfo version upgrade
ee2cbc4d7602c61cf83f53e5f56b4cb0100f2d91
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Components/TeamShiftSwitcher/TeamShiftSwitcher.tsx @@ -1,6 +1,6 @@ -import React from 'react'; +import React, { useState } from 'react'; import { TeamSwitcherLoading } from './TeamSwitcherLoading'; -import { TouchableOpacity, View } from 'react-native'; +import { LayoutChangeEvent, TouchableOpacity, View } from 'react-native'; import { Body, Icons } from '@walmart/gtp-shared-components'; import { Images } from '../../Images/images'; import { useAllsparkImage } from '@walmart/allspark-foundation/Components/context'; @@ -8,7 +8,10 @@ import { teamShiftSwitcherStyles as styles } from './style'; import { TeamShiftSwitcherProps } from './types'; import { useAllsparkTranslation } from '@walmart/allspark-foundation'; import { FEATURE_ID } from '../../constant'; -import { generateShiftText } from '../../Utils/teamShiftSwitcher'; +import { + generateTeamShiftText, + truncateTeamAndShiftText, +} from '../../Utils/teamShiftSwitcher'; export const TeamShiftSwitcher = ({ allSavedTeams, @@ -19,13 +22,33 @@ export const TeamShiftSwitcher = ({ selectedShifts, onPress, }: TeamShiftSwitcherProps) => { - const TeamImage = useAllsparkImage(); const { t } = useAllsparkTranslation(FEATURE_ID); + const fullTeamAndShiftText = generateTeamShiftText( + teamName, + selectedShifts, + numTotalShifts, + t + ); + const [teamAndShiftText, setTeamAndShiftText] = + useState(fullTeamAndShiftText); + const [timesReformatted, setTimesReformatted] = useState(0); + const TeamImage = useAllsparkImage(); const imageInfo = Images[teamId] ?? Images['0000000']; - const shiftText = selectedShifts - ? generateShiftText(selectedShifts, numTotalShifts, t) - : undefined; const savedTeamsText = allSavedTeams ? allSavedTeams.join(', ') : ''; + + const onLayout = (event: LayoutChangeEvent) => { + const textWidth = event.nativeEvent.layout.width; + // first reformat truncates team name text + // second reformat truncates shift text if necessary + // we do not need to format again after this + if (timesReformatted < 2) { + setTeamAndShiftText( + truncateTeamAndShiftText(teamAndShiftText, textWidth, timesReformatted) + ); + setTimesReformatted((prev) => prev + 1); + } + }; + return isLoading ? ( <TeamSwitcherLoading /> ) : ( @@ -36,20 +59,8 @@ export const TeamShiftSwitcher = ({ placeholder={imageInfo.blurhash} /> <View style={styles.shiftInfo}> - <Body numberOfLines={1}> - <Body color='white' weight='700' size='small'> - {teamName} - </Body> - {shiftText && ( - <> - <View style={styles.spacer} /> - <Body color='white'>|</Body> - <View style={styles.spacer} /> - <Body color='white' weight='700' size='small'> - {shiftText} - </Body> - </> - )} + <Body color='white' weight='700' size='small' onLayout={onLayout}> + {teamAndShiftText} </Body> {allSavedTeams && ( <Body --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Components/TeamShiftSwitcher/style.ts @@ -22,11 +22,11 @@ export const teamShiftSwitcherStyles = StyleSheet.create({ shiftInfo: { display: 'flex', flexDirection: 'column', - maxWidth: (width - 16) * 0.72, }, smallText: { fontSize: 12, lineHeight: 16, + maxWidth: (width - 16) * 0.72, }, spacer: { width: 4, --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Images/images.tsx @@ -4,7 +4,7 @@ export const Images: Record< > = { '0000000': { teamName: 'Default', - uri: 'https://i5-me.walmartimages.com/images/teams/task-image-store-02bdfd7611.png', + uri: 'https://i5-me.walmartimages.com/images/teams/my-teams-mgr-exp-1edac1ba4a.png', blurhash: 'KXR:A^%h.AbIj?j??aM|M{', }, }; --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Utils/teamShiftSwitcher.ts @@ -1,16 +1,64 @@ import { TFunction } from 'i18next'; +import { Dimensions } from 'react-native'; -export const generateShiftText = ( - selectedShifts: string[], +const teamShiftDivider = ' | '; + +export const generateTeamShiftText = ( + teamName: string, + selectedShifts: string[] | undefined, numTotalShifts: number, t: TFunction ) => { + if (!selectedShifts || selectedShifts.length === 0) { + return teamName; + } + + let selectedShiftText: string; if (selectedShifts.length === numTotalShifts) { - return t('teamShiftSwitcher.allShifts'); + selectedShiftText = t('teamShiftSwitcher.allShifts'); + } else { + selectedShiftText = selectedShifts?.join(', '); + } + + return `${teamName}${teamShiftDivider}${selectedShiftText}`; +}; + +export const truncateTeamAndShiftText = ( + teamAndShiftText: string, + textWidth: number, + timesReformatted: number +) => { + const { width } = Dimensions.get('window'); + + // availableSpace = width of screen - (screen padding + element padding + team image width + 2 gaps + chevron width) + const availableSpace = (width - 16) * 0.72; + if (availableSpace > textWidth) { + // text fits within available space + return teamAndShiftText; + } + console.log({ availableSpace }); + const overflow = textWidth - availableSpace + 10; // 10 represents space needed for ellipsis; + const splitText = teamAndShiftText.split(teamShiftDivider); + let teamName = splitText[0]; + let shiftText = splitText[1]; + + if (timesReformatted < 1) { + const approxWidthOfTeamName = teamName.length * 9; // average character is 9 wide + if (approxWidthOfTeamName < overflow) { + // if the overflow is wider than the team name, we want to truncate while keeping the first 7 letters + teamName = teamName.substring(0, 7); + } else { + const numLettersToTruncate = Math.ceil(overflow / 9); + teamName = teamName.substring(0, teamName.length - numLettersToTruncate); + } + return `${teamName}...${shiftText ? teamShiftDivider : ''}${ + shiftText ?? '' + }`; } - const shiftKeyword = - selectedShifts.length === 1 - ? t('teamShiftSwitcher.shift') - : t('teamShiftSwitcher.shifts'); - return `${shiftKeyword} ${selectedShifts?.join(', ')}`; + // if the teamName has been truncated and the team and shift text is still greater than the available space + const truncatedTeamAndShiftText = teamAndShiftText.substring( + 0, + Math.ceil(teamAndShiftText.length * (availableSpace / textWidth)) - 3 + ); + return `${truncatedTeamAndShiftText}...`; }; --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/translation.ts @@ -4,8 +4,6 @@ export const enUS = { }, teamShiftSwitcher: { allShifts: 'All shifts', - shift: 'Shift', - shifts: 'Shifts', }, footerButtons: { saveButton: 'Save', @@ -25,8 +23,6 @@ export const esMX: typeof enUS = { }, teamShiftSwitcher: { allShifts: 'Todos los turnos', - shift: 'Cambio', - shifts: 'Cambios', }, footerButtons: { saveButton: 'Salvar',
feat: added truncation
feat: added truncation
0cf5b3632fb50359eb73f60fe594b631849d56e0
--- package-lock.json @@ -3032,9 +3032,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "0.21.0", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.21.0.tgz", - "integrity": "sha512-2BpjegUnn8+c8SPGK13S5rFhU+0MSGe+2kjEpF6Rd/iXQB/KIveUHYPwljSMSm/AIcc5CRCDpa6VKIJgw1/hIg==", + "version": "0.22.0", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.22.0.tgz", + "integrity": "sha512-UbJ6H30ztF9sYJYMJc4N20UitzVU6Dde7lmP+RUKtkXm6mMLzZfHdQpWRKGs4kMhTUGkXy5ARVuDxTUiZLPcRQ==", "requires": { "apisauce": "^1.1.2", "lodash": "^4.17.19", --- package.json @@ -66,7 +66,7 @@ "@walmart/allspark-health-survey-mini-app": "0.0.38", "@walmart/allspark-home-mini-app": "0.4.0", "@walmart/allspark-me-mini-app": "0.1.0", - "@walmart/ask-sam-mini-app": "0.21.0", + "@walmart/ask-sam-mini-app": "0.22.0", "@walmart/config-components": "1.0.21", "@walmart/feedback-all-spark-miniapp": "0.0.50", "@walmart/functional-components": "1.0.27", --- src/translations/en-US.ts @@ -122,9 +122,9 @@ export const enUS = { }, biometric: { promptMessage: 'Use to confirm identity', - modalTitle: 'Would you like to enable $t({{biometric}})?', + modalTitle: 'Would you like to enable $t(biometric.{{biometric}})?', modalMessage: - 'Me@Walmart can use $t({{biometric}}) to confirm your identity?', + 'Me@Walmart can use $t(biometric.{{biometric}}) to confirm your identity?', openSettingsButton: 'Go to settings', cancelButton: 'Not now', FaceID: 'Face ID', --- src/translations/es-MX.ts @@ -121,9 +121,9 @@ export const esMX = { }, biometric: { promptMessage: 'Confirma tu identidad', - modalTitle: 'Te gustaría activar $t({{biometric}})?', + modalTitle: 'Te gustaría activar $t(biometric.{{biometric}})?', modalMessage: - '¿Dar permiso a Me@Walmart para utilizar $t({{biometric}}) para confirmar tu identidad?', + '¿Dar permiso a Me@Walmart para utilizar $t(biometric.{{biometric}}) para confirmar tu identidad?', openSettingsButton: 'Ir a configuración', cancelButton: 'Ahora no', FaceID: 'Face ID',
Bumping ask sam and fixing translation
Bumping ask sam and fixing translation
64e26b8b201ec538b510b1c1ba1eafb5d9e1658a
--- __tests__/harness/firestore/data/messages.ts @@ -3,8 +3,6 @@ import {generateDocumentId} from './documentIds'; // @ts-ignore import {generateCreatedAt} from './timestamps'; import {isNil} from 'lodash'; -import {encryptUserId} from '../../../../src/utils'; -import {rawUserList} from './users'; /** * createImageMessage - generate JSON to mimic a firestore message --- __tests__/harness/firestore/data/stores.ts @@ -3,7 +3,10 @@ import {usersCollectionForStore} from './users'; import { oneToOneChannel_AllMessageTypes, oneToOneChannel_onlyAudioMessages, - oneToOneChannel_onlyTextMessages, teamChannel_Management, voiceChannelForPTT, wholeStoreChannel, + oneToOneChannel_onlyTextMessages, + teamChannel_Management, + voiceChannelForPTT, + wholeStoreChannel, // @ts-ignore } from './channels'; --- __tests__/harness/firestore/data/messages.ts @@ -3,8 +3,6 @@ import {generateDocumentId} from './documentIds'; // @ts-ignore import {generateCreatedAt} from './timestamps'; import {isNil} from 'lodash'; -import {encryptUserId} from '../../../../src/utils'; -import {rawUserList} from './users'; /** * createImageMessage - generate JSON to mimic a firestore message --- __tests__/harness/firestore/data/stores.ts @@ -3,7 +3,10 @@ import {usersCollectionForStore} from './users'; import { oneToOneChannel_AllMessageTypes, oneToOneChannel_onlyAudioMessages, - oneToOneChannel_onlyTextMessages, teamChannel_Management, voiceChannelForPTT, wholeStoreChannel, + oneToOneChannel_onlyTextMessages, + teamChannel_Management, + voiceChannelForPTT, + wholeStoreChannel, // @ts-ignore } from './channels';
fix lint issues
fix lint issues
d8cfe38a5db44888049997618e6df86633f457f8
--- src/hooks/messages.ts @@ -64,8 +64,8 @@ export const useStartStoreText = (replace: boolean = false) => { export const useStartTeamText = (replace: boolean = false) => { const navigation = useNavigation<StackNavigationProp<TextingNavParamsMap>>(); - const userId = useSelector(UserSelectors.getUserId); - const site = useSelector(SiteSelectors.getUserWorkingSite); + const userId: string = useSelector(UserSelectors.getUserId); + const site: string = useSelector(SiteSelectors.getUserWorkingSite); return useCallback( (teamId: string) => { --- src/index.tsx @@ -58,8 +58,8 @@ export const TextingMiniApp = () => { dispatch: Dispatch<any>, ] = useReducer(textingReducer, initialTextingState); const clientConfig = useMemo(() => getClientConfig(envConfig), [envConfig]); - const storeId = useSelector(SiteSelectors.getUserWorkingSite) ?? '1'; - const countryCode = useSelector(SiteSelectors.getSiteCountry) ?? 'us'; + const storeId: string = useSelector(SiteSelectors.getUserWorkingSite) ?? '1'; + const countryCode: string = useSelector(SiteSelectors.getSiteCountry) ?? 'us'; useMemo(() => { purgeOldFiles(); --- src/hooks/messages.ts @@ -64,8 +64,8 @@ export const useStartStoreText = (replace: boolean = false) => { export const useStartTeamText = (replace: boolean = false) => { const navigation = useNavigation<StackNavigationProp<TextingNavParamsMap>>(); - const userId = useSelector(UserSelectors.getUserId); - const site = useSelector(SiteSelectors.getUserWorkingSite); + const userId: string = useSelector(UserSelectors.getUserId); + const site: string = useSelector(SiteSelectors.getUserWorkingSite); return useCallback( (teamId: string) => { --- src/index.tsx @@ -58,8 +58,8 @@ export const TextingMiniApp = () => { dispatch: Dispatch<any>, ] = useReducer(textingReducer, initialTextingState); const clientConfig = useMemo(() => getClientConfig(envConfig), [envConfig]); - const storeId = useSelector(SiteSelectors.getUserWorkingSite) ?? '1'; - const countryCode = useSelector(SiteSelectors.getSiteCountry) ?? 'us'; + const storeId: string = useSelector(SiteSelectors.getUserWorkingSite) ?? '1'; + const countryCode: string = useSelector(SiteSelectors.getSiteCountry) ?? 'us'; useMemo(() => { purgeOldFiles();
adding explicit types to selectors
adding explicit types to selectors
e08c5990a0f06e299ce609762c47eb89ec456a1a
--- ios/AllSpark/AllSpark-beta.entitlements @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>aps-environment</key> + <string>development</string> + <key>com.apple.security.application-groups</key> + <array> + <string>group.com.walmart</string> + </array> + <key>keychain-access-groups</key> + <array> + <string>$(AppIdentifierPrefix)com.walmart.GenericKeychain</string> + </array> +</dict> +</plist> --- ios/AllSpark/AllSpark-prod.entitlements @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>aps-environment</key> + <string>development</string> + <key>keychain-access-groups</key> + <array> + <string>$(AppIdentifierPrefix)com.walmart.GenericKeychain</string> + </array> +</dict> +</plist> --- ios/AllSpark/AllSpark.entitlements @@ -4,6 +4,10 @@ <dict> <key>aps-environment</key> <string>development</string> + <key>com.apple.security.application-groups</key> + <array> + <string>group.com.walmart</string> + </array> <key>keychain-access-groups</key> <array> <string>$(AppIdentifierPrefix)com.walmart.GenericKeychain</string> --- scripts/updateiOSProjectConfig.sh @@ -10,6 +10,7 @@ env=$1 xcodeproj=./ios/AllSpark.xcodeproj plist=./ios/AllSpark/Info.plist +entitlementsPath=./ios/AllSpark ## Find and replace Enterprise team Id with the iTunesConnect account iTUNESCONNECT_TEAM_ID="74G6H8XY8B" @@ -32,6 +33,9 @@ PROD_DEV_PROVISIONING="Squiggly_Dev_Provision" BETA_INHOUSE_PROVISIONING="MeAtWMBeta_InHouse_Provision" BETA_DEV_PROVISIONING="MeAtWMBeta_Dev_Provision" +PROD_ENTITLEMENTS="AllSpark-Prod.entitlements" +BETA_ENTITLEMENTS="AllSpark-Beta.entitlements" +DEFAULT_ENTITLEMENTS="AllSpark.entitlements" # Generate AppIcon name based on the environment APP_ICON="AppIcon-$env" @@ -41,11 +45,13 @@ SPLASH_SCREEN="<string>LaunchScreen-$env<\/string>" if [[ "${env}" == "Prod" ]]; then TEAM_ID=$iTUNESCONNECT_TEAM_ID BUNDLE_ID=$PROD_BUNDLE_ID + ENTITLEMENTS=$PROD_ENTITLEMENTS INHOUSE_PROVISION=$PROD_INHOUSE_PROVISIONING DEV_PROVISION=$PROD_DEV_PROVISIONING else TEAM_ID=$ENTERPRISE_TEAM_ID BUNDLE_ID=$BETA_BUNDLE_ID + ENTITLEMENTS=$BETA_ENTITLEMENTS INHOUSE_PROVISION=$BETA_INHOUSE_PROVISIONING DEV_PROVISION=$BETA_DEV_PROVISIONING fi @@ -87,4 +93,7 @@ echo "Updating InHouse Provisioning profile with \"$INHOUSE_PROVISION\" " sed -Ei '' "s/$PROD_INHOUSE_PROVISIONING;|$BETA_INHOUSE_PROVISIONING;/$INHOUSE_PROVISION;/" ${pbxprojFile} echo "Updating Dev Provisioning profile with \"$DEV_PROVISION\" " -sed -Ei '' "s/$PROD_DEV_PROVISIONING;|$BETA_DEV_PROVISIONING;/$DEV_PROVISION;/" ${pbxprojFile} \ No newline at end of file +sed -Ei '' "s/$PROD_DEV_PROVISIONING;|$BETA_DEV_PROVISIONING;/$DEV_PROVISION;/" ${pbxprojFile} + +echo "Copying contents of App Entitlements file with \"$ENTITLEMENTS\"" +cp $entitlementsPath/$ENTITLEMENTS $entitlementsPath/$DEFAULT_ENTITLEMENTS \ No newline at end of file
Added changes to incorporate dev/beta builds to work seamlessly with … (#449)
Added changes to incorporate dev/beta builds to work seamlessly with … (#449) * Added changes to incorporate dev/beta builds to work seamlessly with other IAM SSO apps installed on the device * verbiage fix Co-authored-by: Hitesh Arora <>
ccb2a67cd138d73747a8217523a45ae42408301a
--- 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.7", - "@walmart/ims-print-services-ui": "2.8.0", + "@walmart/ims-print-services-ui": "2.8.1", "@walmart/inbox-mini-app": "0.89.2", "@walmart/iteminfo-mini-app": "7.7.4", "@walmart/learning-mini-app": "17.0.4", @@ -9003,9 +9003,9 @@ } }, "node_modules/@walmart/ims-print-services-ui": { - "version": "2.8.0", - "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.8.0.tgz", - "integrity": "sha512-Iqe7kNS9WRhmDkaIr7/4GwAE3s0lPQ0vcRYkIwchFeT1NE/PC/FVU3DoiNX2pgq6mXkg09PhyYGxmOe5+9ggUA==", + "version": "2.8.1", + "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.8.1.tgz", + "integrity": "sha512-Chd6awCJX/VoAS9aIeq8LoryBoUs4cP2cGw0Xpzh6bGN3OEIK+w0tGqh8viMkUw8N3aDAi/MD5N5bwh2Lr6FGA==", "peerDependencies": { "@react-native-firebase/analytics": ">=10.5.1", "@react-native-firebase/app": ">=10.5.0", @@ -9016,6 +9016,7 @@ "@walmart/functional-components": ">=1.0.22", "@walmart/gtp-shared-components": ">=2.0.6", "@walmart/react-native-logger": ">=1.17.0", + "@walmart/react-native-scanner-3.0": ">=0.4.4", "@walmart/ui-components": ">=1.1.11", "i18next": "^22.0.1", "moment": "^2.29.4", @@ -33353,9 +33354,9 @@ "integrity": "sha512-nQdm2UHmllwsY5jYGxdebgT2oXBvrhIVWutDvz1xtYHcD1ZkcSZpa8CQpnltTdeSRy0bJ8K8hfqtPSGTybum5g==" }, "@walmart/ims-print-services-ui": { - "version": "2.8.0", - "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.8.0.tgz", - "integrity": "sha512-Iqe7kNS9WRhmDkaIr7/4GwAE3s0lPQ0vcRYkIwchFeT1NE/PC/FVU3DoiNX2pgq6mXkg09PhyYGxmOe5+9ggUA==" + "version": "2.8.1", + "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.8.1.tgz", + "integrity": "sha512-Chd6awCJX/VoAS9aIeq8LoryBoUs4cP2cGw0Xpzh6bGN3OEIK+w0tGqh8viMkUw8N3aDAi/MD5N5bwh2Lr6FGA==" }, "@walmart/inbox-mini-app": { "version": "0.89.2", --- 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.7", - "@walmart/ims-print-services-ui": "2.8.0", + "@walmart/ims-print-services-ui": "2.8.1", "@walmart/inbox-mini-app": "0.89.2", "@walmart/iteminfo-mini-app": "7.7.4", "@walmart/learning-mini-app": "17.0.4",
bump print ui version
bump print ui version
1791fb08dc35b1e45982559da039cb79ca868684
--- .looper.codepush.yml @@ -38,6 +38,7 @@ flows: git branch -a echo 'git setup done, moving to node part now' - npm install -g appcenter-cli + - echo 'doing listing' - appcenter apps list --token $APPCENTER_API_TOKEN_ANDROID pr:
updated with develop
updated with develop
8c8913b65ce42a07f2bbda4f440bd8b2f0868382
--- src/auth/ErrorScreen.tsx @@ -28,6 +28,7 @@ import {encryptUserId} from '../services/MaskUserId'; import styles from './styles'; import {initialConfig} from './constants'; import WmConfig from 'react-native-wm-config'; +import {isEmpty} from 'lodash'; interface Lang { 'en-US': string; @@ -47,7 +48,7 @@ export const ErrorScreen: FC<any> = (props) => { const [siteId, setSiteId] = useState(''); const [detail, setDetail] = useState(''); const [formDirty, setFormDirty] = useState(false); - const [errorCategory, setErrorCategory] = useState(''); + const [errorCategory, setErrorCategory] = useState(initialConfig.issues[0]); const [errorCategoriesFb, setErrorCategoriesFb] = useState( initialConfig.issues, ); @@ -59,6 +60,10 @@ export const ErrorScreen: FC<any> = (props) => { const siteIdValid = !formDirty || !!siteId; const errSelectValid = !formDirty || !!errorCategory; const missingFields = !userId || !siteId || !errorCategory; + const missingOther = + errorCategory[lang] === translate('ssoError.other') + ? isEmpty(selectedOther) + : false; useEffect(() => { WmTelemetry.logEvent(SSO_APP, 'feedback_screen_loaded', {}); @@ -82,7 +87,8 @@ export const ErrorScreen: FC<any> = (props) => { const onSave = () => { setFormDirty(true); - if (!missingFields) { + + if (!missingFields && !missingOther) { const userIdValue = userId.split('.')[0]; navigation.goBack(); WmTelemetry.logEvent(SSO_APP, 'feedback_submitted', {}); @@ -96,7 +102,8 @@ export const ErrorScreen: FC<any> = (props) => { message: detail || 'no details entered by the user', userId: encryptUserId(userIdValue.toUpperCase(), siteId), siteId: siteId, - errorCategory: errorCategory, + code: errorCategory.code, + errorCategory: errorCategory[lang], otherOptions: formatedMsgOther, }); } @@ -196,16 +203,18 @@ export const ErrorScreen: FC<any> = (props) => { <Dropdown label='' placeholder={translate('ssoError.selectIssue')} - value={errorCategory} + value={errorCategory[lang]} style={styles.dropdown} values={getErrCategoryList(errorCategoriesFb)} onSelect={(value) => { - setErrorCategory(value); + setErrorCategory( + errorCategoriesFb.find((opn) => opn[lang] === value) || + initialConfig.issues[0], + ); }} /> </View> - - {missingFields && formDirty && ( + {missingFields && formDirty && missingOther && ( <View style={styles.requiredErrorContainer}> <Subheader testID='error-msg' style={styles.requiredError}> {translate('ssoError.requiredError')} @@ -217,7 +226,7 @@ export const ErrorScreen: FC<any> = (props) => { </View> )} </View> - {errorCategory === translate('ssoError.other') && ( + {errorCategory[lang] === translate('ssoError.other') && ( <View> {otherErrorFb.map((question) => { const title = question.title[lang]; --- src/auth/constants.ts @@ -24,34 +24,52 @@ export const Q2Options = ['q2Option1', 'q2Option2', 'q2Option3']; export const defaultConfig = { issues: [ { + code: 'SSO100', 'en-US': 'Clock-in/clock-out issue', 'es-MX': 'Problema de registro de entrada/salida', }, { - 'en-US': '2-step verification failure', - 'es-MX': 'Fallo de verificación de 2 pasos', - }, - { + code: 'SSO101', 'en-US': 'Store transfer issue', 'es-MX': 'Problema de transferencia de tienda', }, { + code: 'SSO102', 'en-US': 'New phone or new number', 'es-MX': 'Nuevo teléfono o nuevo número', }, { + code: 'SSO103', 'en-US': "Didn't receive text verification", 'es-MX': 'No recibí la verificación por mensaje de texto ', }, { + code: 'SSO104', + 'en-US': "Didn't receive call", + 'es-MX': 'no recibi llamada', + }, + { + code: 'SSO105', 'en-US': "Can't receive push notifications", 'es-MX': 'No puedo recibir push notifications', }, { + code: 'SSO106', + 'en-US': 'Asked to visit wmlink/2step to register', + 'es-MX': 'Asked to visit wmlink/2step to register', + }, + { + code: 'SSO107', + 'en-US': 'Unable to login using password', + 'es-MX': 'Unable to login using password', + }, + { + code: 'SSO108', 'en-US': 'Store Wi-Fi issue', 'es-MX': 'Problema con el Wi-Fi de la tienda', }, { + code: 'SSO109', 'en-US': 'Other', 'es-MX': 'Otro', }, @@ -65,14 +83,17 @@ export const defaultConfig = { }, options: [ { + code: 'SSO201', 'en-US': 'Sign in was not displayed', 'es-MX': 'No se mostró el inicio de sesión', }, { + code: 'SSO202', 'en-US': 'I could not submit user id / password', 'es-MX': 'No pude ingresar el ID de usuario/contraseña', }, { + code: 'SSO203', 'en-US': "I'm able to login to other Walmart apps on my phone (IE Workplace, One Walmart)", 'es-MX': @@ -88,14 +109,17 @@ export const defaultConfig = { }, options: [ { + code: 'PERSONAL', 'en-US': 'Personal device', 'es-MX': 'Dispositivo personal', }, { + code: 'BYOD', 'en-US': 'Personal device (BYOD enrolled)', 'es-MX': 'Dispositivo personal (inscrito en BYOD)', }, { + code: 'COPE', 'en-US': 'Work phone (Samsung x cover)', 'es-MX': 'Teléfono de trabajo (Samsung XCover)', }, @@ -107,6 +131,7 @@ export const defaultConfig = { export const initialConfig = { issues: [ { + code: '', 'en-US': '', 'es-MX': '', }, @@ -120,6 +145,7 @@ export const initialConfig = { }, options: [ { + code: '', 'en-US': '', 'es-MX': '', },
other field mandatory
other field mandatory
7e0be0293c8249d06ca722db4c3de7deeb236cbd
--- package.json @@ -118,7 +118,7 @@ "@walmart/global-vpi-mini-app": "1.1.40", "@walmart/gta-react-native-calendars": "0.7.0", "@walmart/gtp-shared-components": "2.3.0-rc.0", - "@walmart/gtp-shared-components-3": "npm:@walmart/gtp-shared-components@3.0.0-beta.8", + "@walmart/gtp-shared-components-3": "npm:@walmart/gtp-shared-components@3.0.0-beta.9", "@walmart/ims-print-services-ui": "2.23.0", "@walmart/inbox-mini-app": "patch:@walmart/inbox-mini-app@npm%3A0.104.1#~/.yarn/patches/@walmart-inbox-mini-app-npm-0.104.1-442e184d35.patch", "@walmart/invue-react-native-sdk": "0.1.26-alpha.14", --- yarn.lock @@ -4859,15 +4859,15 @@ __metadata: languageName: node linkType: hard -"@livingdesign/tokens-next@npm:@livingdesign/tokens@1.13.0": - version: 1.13.0 - resolution: "@livingdesign/tokens@npm:1.13.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40livingdesign%2Ftokens%2F-%2F%40livingdesign%2Ftokens-1.13.0.tgz" +"@livingdesign/tokens-next@npm:@livingdesign/tokens@1.16.0": + version: 1.16.0 + resolution: "@livingdesign/tokens@npm:1.16.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40livingdesign%2Ftokens%2F-%2F%40livingdesign%2Ftokens-1.16.0.tgz" peerDependencies: "@livingdesign/icons": ^1.0.0 peerDependenciesMeta: "@livingdesign/icons": optional: true - checksum: 10c0/e1c9d2b73f1c850280ef1af3f5aee1532b90c56dad38345d425abd2b861979543cdb8f5ef602a49d072b762b0f04ca95993037183f84cc86fc527a43d8bf7c0d + checksum: 10c0/c9350e8def60273f0a07c05d4b561732f85b36f2cb5b08656f48a2dc8338af91a8a67b8ce294d1f353c4fed446b8f12b366414f48d967139f4055649dbcabb1c languageName: node linkType: hard @@ -7985,11 +7985,11 @@ __metadata: languageName: node linkType: hard -"@walmart/gtp-shared-components-3@npm:@walmart/gtp-shared-components@3.0.0-beta.8": - version: 3.0.0-beta.8 - resolution: "@walmart/gtp-shared-components@npm:3.0.0-beta.8::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fgtp-shared-components%2F-%2F%40walmart%2Fgtp-shared-components-3.0.0-beta.8.tgz" +"@walmart/gtp-shared-components-3@npm:@walmart/gtp-shared-components@3.0.0-beta.9": + version: 3.0.0-beta.9 + resolution: "@walmart/gtp-shared-components@npm:3.0.0-beta.9::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fgtp-shared-components%2F-%2F%40walmart%2Fgtp-shared-components-3.0.0-beta.9.tgz" dependencies: - "@livingdesign/tokens-next": "npm:@livingdesign/tokens@1.13.0" + "@livingdesign/tokens-next": "npm:@livingdesign/tokens@1.16.0" "@walmart/gtp-shared-mega-icons": "npm:1.0.1" lodash: "npm:^4.17.15" moment: "npm:^2.29.4" @@ -8005,7 +8005,7 @@ __metadata: bin: installFonts: ./scripts/installFonts runCodemods: ./scripts/runCodemods - checksum: 10c0/b6411bce1296e9af8794a32a906c9a5fcb1479c8fd2f728111335898c2ffccc08c4c8b3a2c06a815c0593b483ae19a6459e641099f7406b14d31c4d7da81f509 + checksum: 10c0/d6b955b395ae58d0d427b5a44069aec4f8f73f9b9d74e9c9c1644bc2b0db09aa11acab650b4c69332f4b833daab4fd954b7f6582c602688c9f00fceb92e6c40a languageName: node linkType: hard @@ -8487,7 +8487,7 @@ __metadata: "@walmart/global-vpi-mini-app": "npm:1.1.40" "@walmart/gta-react-native-calendars": "npm:0.7.0" "@walmart/gtp-shared-components": "npm:2.3.0-rc.0" - "@walmart/gtp-shared-components-3": "npm:@walmart/gtp-shared-components@3.0.0-beta.8" + "@walmart/gtp-shared-components-3": "npm:@walmart/gtp-shared-components@3.0.0-beta.9" "@walmart/ims-print-services-ui": "npm:2.23.0" "@walmart/inbox-mini-app": "patch:@walmart/inbox-mini-app@npm%3A0.104.1#~/.yarn/patches/@walmart-inbox-mini-app-npm-0.104.1-442e184d35.patch" "@walmart/invue-react-native-sdk": "npm:0.1.26-alpha.14" @@ -23320,11 +23320,11 @@ __metadata: "typescript@patch:typescript@npm%3A~5.8.3#optional!builtin<compat/typescript>": version: 5.8.3 - resolution: "typescript@patch:typescript@npm%3A5.8.3%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252Ftypescript%252F-%252Ftypescript-5.8.3.tgz#optional!builtin<compat/typescript>::version=5.8.3&hash=5786d5" + resolution: "typescript@patch:typescript@npm%3A5.8.3%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252Ftypescript%252F-%252Ftypescript-5.8.3.tgz#optional!builtin<compat/typescript>::version=5.8.3&hash=379a07" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/39117e346ff8ebd87ae1510b3a77d5d92dae5a89bde588c747d25da5c146603a99c8ee588c7ef80faaf123d89ed46f6dbd918d534d641083177d5fac38b8a1cb + checksum: 10c0/92ea03509e06598948559ddcdd8a4ae5a7ab475766d5589f1b796f5731b3d631a4c7ddfb86a3bd44d58d10102b132cd4b4994dda9b63e6273c66d77d6a271dbd languageName: node linkType: hard
fix: update GTP 3.x shared components (#5052)
fix: update GTP 3.x shared components (#5052)
01a9cbdecbb00bcb916680e57b4cbc15a01475c4
--- src/auth/LoginErrorScreen/index.tsx @@ -117,11 +117,11 @@ export const ErrorScreen = ( const customErrorCode = params?.authError?.code; const [isNetworkError, isTimeMismatchError, isBrowserNotFoundError] = useMemo(() => { - const networkError = networkErrors.some((term) => - customError?.toLowerCase()?.includes(term), + const networkError = networkErrors.some( + (term) => customError?.toLowerCase()?.includes(term), ); - const timeMismatch = timeMismatchErrors.some((term) => - customError?.toLowerCase()?.includes(term), + const timeMismatch = timeMismatchErrors.some( + (term) => customError?.toLowerCase()?.includes(term), ); const noBrowserFound = noBrowserAndroidErrors === customErrorCode; return [networkError, timeMismatch, noBrowserFound]; --- src/hooks/useCanImpersonate.ts @@ -11,8 +11,9 @@ export const useCanImpersonate = () => { const user: User | null = useSelector(UserSelectors.getOriginalUser); const impersonatorGroups: string[] = useSelector(getImpersonatorGroups); - return impersonatorGroups.some((group: string) => - // @ts-ignore - user?.memberOf?.includes(group), + return impersonatorGroups.some( + (group: string) => + // @ts-ignore + user?.memberOf?.includes(group), ); }; --- src/startup/AuthFlow.ts @@ -18,8 +18,8 @@ const SILENT_SSO_ERRORS = [ ]; export const isSilentSignInError = (error?: Error) => - SILENT_SSO_ERRORS.some((silentError) => - `${error}`?.toLowerCase().includes(silentError), + SILENT_SSO_ERRORS.some( + (silentError) => `${error}`?.toLowerCase().includes(silentError), ); export function* authFlow() {
lint fixes
lint fixes
d60d8be34ef45944defc3b3b1f3f4f2e84b33fbc
--- packages/allspark-foundation-hub/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.25.25](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.25.24...@walmart/allspark-foundation-hub@1.25.25) (2025-12-19) + +**Note:** Version bump only for package @walmart/allspark-foundation-hub + ## [1.25.24](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.25.23...@walmart/allspark-foundation-hub@1.25.24) (2025-12-18) **Note:** Version bump only for package @walmart/allspark-foundation-hub --- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.25.24", + "version": "1.25.25", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", --- packages/allspark-foundation/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.17.5](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.17.4...@walmart/allspark-foundation@7.17.5) (2025-12-19) + +**Note:** Version bump only for package @walmart/allspark-foundation + ## [7.17.4](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.17.3...@walmart/allspark-foundation@7.17.4) (2025-12-18) **Note:** Version bump only for package @walmart/allspark-foundation --- packages/allspark-foundation/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation", - "version": "7.17.4", + "version": "7.17.5", "description": "", "main": "Core/index.js", "types": "Core/index.d.ts", --- packages/components-library/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.2.10](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/ax-components@1.2.9...@walmart/ax-components@1.2.10) (2025-12-19) + +### Bug Fixes + +- **ax:** rename icomoon font file to match the postscript name ([#545](https://gecgithub01.walmart.com/allspark/allspark/issues/545)) ([bc6efaf](https://gecgithub01.walmart.com/allspark/allspark/commit/bc6efafa8377027e8b5be94948c7e44fd6c64ca4)) + ## [1.2.9](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/ax-components@1.2.8...@walmart/ax-components@1.2.9) (2025-12-11) ### Bug Fixes --- packages/components-library/package.json @@ -57,7 +57,7 @@ "test:coverage": "jest --coverage", "expo:check": "expo install --check" }, - "version": "1.2.9", + "version": "1.2.10", "main": "lib/index.js", "types": "lib/index.d.ts", "name": "@walmart/ax-components", --- packages/my-walmart-hub/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.8.6](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/my-walmart-hub@1.8.5...@walmart/my-walmart-hub@1.8.6) (2025-12-19) + +**Note:** Version bump only for package @walmart/my-walmart-hub + ## [1.8.5](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/my-walmart-hub@1.8.4...@walmart/my-walmart-hub@1.8.5) (2025-12-18) **Note:** Version bump only for package @walmart/my-walmart-hub --- packages/my-walmart-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/my-walmart-hub", - "version": "1.8.5", + "version": "1.8.6", "description": "My Walmart Hub - A comprehensive hub framework for building dynamic widget-based interfaces", "main": "lib/index.js", "types": "lib/index.d.ts",
chore(version): updating package version
chore(version): updating package version - @walmart/allspark-foundation@7.17.5 - @walmart/allspark-foundation-hub@1.25.25 - @walmart/ax-components@1.2.10 - @walmart/my-walmart-hub@1.8.6
5dcf8cc1c99d2f04d1b16b82ef2bc8a8530ab366
--- src/navigation/Navigation.tsx @@ -1,7 +1,10 @@ import React from 'react'; import {View, Text, TouchableOpacity, StyleProp, ViewStyle} from 'react-native'; import {useTranslation} from 'react-i18next'; -import {DrawerActions} from '@react-navigation/native'; +import { + DrawerActions, + getFocusedRouteNameFromRoute, +} from '@react-navigation/native'; import {createBottomTabNavigator} from '@react-navigation/bottom-tabs'; import {createDrawerNavigator} from '@react-navigation/drawer'; import {createStackNavigator} from '@react-navigation/stack'; @@ -25,6 +28,7 @@ import {bottomSheetTransitionOptions} from './BottomSheetTransition'; import styles from './NavigationStyle'; import {StackHeaderOptions} from '@react-navigation/stack/lib/typescript/src/types'; +import type {TFunction} from 'i18next'; // TODO - this is temporary and should be removed once all nav content is filled in const placeholderStyle: StyleProp<ViewStyle> = { @@ -106,6 +110,20 @@ const MainTabsNav = () => { ); }; +const getMainHeaderTitle = (route: any, translate: TFunction) => { + const routeName = getFocusedRouteNameFromRoute(route); + switch (routeName) { + case 'inbox': + return translate('navigation.inbox'); + case 'myTeam': + return translate('navigation.myTeam'); + case 'me': + return translate('navigation.me'); + default: + return translate('navigation.main'); + } +}; + const commonHeaderProps = { headerStyle: styles.primaryHeader, headerTintColor: 'white', @@ -116,27 +134,29 @@ const commonHeaderProps = { const DrawerContent = createStackNavigator(); -const DrawerContentNav = () => ( - <DrawerContent.Navigator> - <DrawerContent.Screen - name='main' - component={MainTabsNav} - options={({navigation}) => ({ - ...commonHeaderProps, - headerShown: true, - // TODO - take title from current route? - headerTitle: 'Me@Walmart', - headerLeft: () => ( - <TouchableOpacity - onPress={() => navigation.dispatch(DrawerActions.toggleDrawer())} - style={styles.menuButton}> - <Icon name='MenuWhite' /> - </TouchableOpacity> - ), - })} - /> - </DrawerContent.Navigator> -); +const DrawerContentNav = () => { + const [translate] = useTranslation(); + return ( + <DrawerContent.Navigator> + <DrawerContent.Screen + name='main' + component={MainTabsNav} + options={({navigation, route}) => ({ + ...commonHeaderProps, + headerShown: true, + headerTitle: getMainHeaderTitle(route, translate), + headerLeft: () => ( + <TouchableOpacity + onPress={() => navigation.dispatch(DrawerActions.toggleDrawer())} + style={styles.menuButton}> + <Icon name='MenuWhite' /> + </TouchableOpacity> + ), + })} + /> + </DrawerContent.Navigator> + ); +}; const Drawer = createDrawerNavigator(); --- src/translations/en-US.ts @@ -20,6 +20,7 @@ export const enUS = { '@walmart/wfm-ui': 'WFM UI', }, navigation: { + main: 'Me@Walmart', home: 'Home', me: 'Me', myTeam: 'My Team', --- src/translations/es-MX.ts @@ -20,6 +20,7 @@ export const esMX = { '@walmart/wfm-ui': 'WFM UI', }, navigation: { + main: 'Me@Walmart', home: 'Cuna', me: 'Yo', myTeam: 'Mi Equipo',
changing the header based on the tab chosen (#115)
changing the header based on the tab chosen (#115)
50e98924f6928eab165913315efe204b3c849f71
--- package-lock.json @@ -3367,9 +3367,9 @@ "integrity": "sha512-Am5QrgtwxJ23j3GsZZivaZknjiWTuPFvFxV1J0ysrQZ3H4wZcgsxuFdsCJqA3Hzufo3pZdyMTZhNtAx4IuQjjw==" }, "@walmart/inbox-mini-app": { - "version": "0.0.102", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.0.102.tgz", - "integrity": "sha512-6VxVyc6q6xpD0D9PigdX94G4BQ9YXvPHeMIVKELqv/583bznJi4ExEIoR/G6Arz9YA2/erp8O9sbO3qpzly95w==" + "version": "0.0.104", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.0.104.tgz", + "integrity": "sha512-wf8H1YIc0ngWt1GsqUlFqOU8HF+PlmxkmHo6NCSL/qDcSIS6VqVOQmU0p6ZPdFhhhS5opazBZXV3wVZSpSel4A==" }, "@walmart/iteminfo-mini-app": { "version": "1.0.22", --- package.json @@ -75,7 +75,7 @@ "@walmart/gtp-shared-components": "^1.2.0", "@walmart/impersonation-mini-app": "1.0.15", "@walmart/ims-print-services-ui": "0.0.19", - "@walmart/inbox-mini-app": "0.0.102", + "@walmart/inbox-mini-app": "0.0.104", "@walmart/iteminfo-mini-app": "1.0.22", "@walmart/manager-approvals-miniapp": "0.0.42", "@walmart/metrics-mini-app": "0.4.10",
Inbox version bump
Inbox version bump SSMP-1873
ff861bf1da14cabe269cf9b3510618d759959ef5
--- package.json @@ -119,7 +119,7 @@ "@walmart/me-at-walmart-common": "workspace:^", "@walmart/me-at-walmart-container": "workspace:^", "@walmart/metrics-mini-app": "1.29.6", - "@walmart/mod-flex-mini-app": "1.26.3", + "@walmart/mod-flex-mini-app": "1.26.4", "@walmart/moment-walmart": "1.0.4", "@walmart/money-auth-shared-components": "2.3.8", "@walmart/myteam-mini-app": "1.26.0", --- yarn.lock @@ -8352,7 +8352,7 @@ __metadata: "@walmart/me-at-walmart-common": "workspace:^" "@walmart/me-at-walmart-container": "workspace:^" "@walmart/metrics-mini-app": "npm:1.29.6" - "@walmart/mod-flex-mini-app": "npm:1.26.3" + "@walmart/mod-flex-mini-app": "npm:1.26.4" "@walmart/moment-walmart": "npm:1.0.4" "@walmart/money-auth-shared-components": "npm:2.3.8" "@walmart/myteam-mini-app": "npm:1.26.0" @@ -8635,9 +8635,9 @@ __metadata: languageName: node linkType: hard -"@walmart/mod-flex-mini-app@npm:1.26.3": - version: 1.26.3 - resolution: "@walmart/mod-flex-mini-app@npm:1.26.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fmod-flex-mini-app%2F-%2F%40walmart%2Fmod-flex-mini-app-1.26.3.tgz" +"@walmart/mod-flex-mini-app@npm:1.26.4": + version: 1.26.4 + resolution: "@walmart/mod-flex-mini-app@npm:1.26.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fmod-flex-mini-app%2F-%2Fmod-flex-mini-app-1.26.4.tgz" peerDependencies: "@react-navigation/drawer": ">=6" "@react-navigation/material-top-tabs": ">=6" @@ -8672,7 +8672,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 uuid: ^3.3.2 - checksum: 10c0/0f8410ed57c02d1794717c837512d4e12d15adbf56ad9922fedc31acf57b207ac31faf69cd983634e1dfea48bf0643f78577c2b63e6d582fc7c288ca2cc5f393 + checksum: 10c0/fc327e7232a8df0bf9c326b6912251a4f552c0b32959a699d90837ff3de83ebc45e56c3ee24e15dec5a9454897c99810c6a5db85ea489f75408ee4cb20b2dbec languageName: node linkType: hard
revert(revert changes for hourly associates): FSS-7920 revert changes (#4212)
revert(revert changes for hourly associates): FSS-7920 revert changes (#4212) Co-authored-by: Shubhang Shah - s0s0zug <Shubhang.Shah@walmart.com>
f484188ff05d4108945bf43e14249dc2f82b226b
--- src/index.tsx @@ -4,9 +4,7 @@ import {useEnvironment} from '@walmart/core-services/Environment'; import {LoggerCloneProvider} from '@walmart/core-services/Logger'; import {HttpClientCloneProvider} from '@walmart/allspark-http-client'; -import {getHttpConfig, HTTP_CLIENT_KEY} from './services/config'; import {TextingNavigation} from './navigation'; -import {ChannelsProvider} from './channels/provider'; import {initNotificationListeners} from './notification'; import {initi18n} from './translations'; import {ClockedOutScreenGuard} from './components/ClockedOutScreenGuard'; @@ -14,8 +12,8 @@ import {SafeAreaProvider} from 'react-native-safe-area-context'; import {analytics} from './logger/Analytics'; import {logger} from './logger/Logger'; import firestore from '@react-native-firebase/firestore'; +import {getHttpConfig, HTTP_CLIENT_KEY} from "./services/config"; -export {PushToTalkProvider} from './channels/pushToTalkProvider'; export const LOGGER_FIELDS = {id: 'texting-mini-app'}; @@ -72,9 +70,7 @@ export const TextingMiniApp = () => { <LoggerCloneProvider fields={LOGGER_FIELDS}> <HttpClientCloneProvider id={HTTP_CLIENT_KEY} config={httpConfig}> <ClockedOutScreenGuard> - <ChannelsProvider> <TextingNavigation /> - </ChannelsProvider> </ClockedOutScreenGuard> </HttpClientCloneProvider> </LoggerCloneProvider> --- src/services/config.ts @@ -0,0 +1,26 @@ +import type {EnvConfig} from '@walmart/core-services/Environment'; +const miniAppPackage = require('../../package.json'); + +export const HTTP_CLIENT_KEY = 'texting'; + +export const getGraphQLConfig = (envConfig: EnvConfig) => { + return { + headers: { + //envConfig.consumerId, // temporary until onboarded with athena + 'wm_consumer.id': + envConfig.env === 'prod' + ? 'cfac4a3d-ae91-43c8-81f5-ceb838e4cd44' + : '25fe4e50-7085-4793-863c-08b990282345', + 'x-o-platform': 'texting-miniapp', + 'x-o-platform-version': miniAppPackage?.version || '2.x.x', + }, + }; +}; + +// Will be used to configure clone provider, which will merge config with instance above +export const getHttpConfig = (envConfig: EnvConfig) => ({ + baseURL: `${envConfig.externalBffUrl}/api-proxy/service`, + headers: { + 'wm_consumer.id': envConfig.consumerId, + }, +});
fixing index file
fixing index file
0786fe22f04b315ca1e09f3fc094edd5ea58bc62
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "1.2.2", + "version": "1.2.3", "main": "dist/index.js", "files": [ "dist" @@ -75,7 +75,7 @@ "@walmart/me-at-walmart-container": "latest", "@walmart/redux-store": "3.7.0", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "1.2.6", + "@walmart/wmconnect-mini-app": "1.3.0", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", --- yarn.lock @@ -6080,7 +6080,7 @@ __metadata: "@walmart/react-native-sumo-sdk": "npm:2.6.0" "@walmart/redux-store": "npm:3.7.0" "@walmart/ui-components": "npm:1.15.1" - "@walmart/wmconnect-mini-app": "npm:1.2.6" + "@walmart/wmconnect-mini-app": "npm:1.3.0" babel-jest: "npm:^29.2.1" chance: "npm:^1.1.11" eslint: "npm:8.22.0" @@ -6168,9 +6168,9 @@ __metadata: languageName: node linkType: hard -"@walmart/wmconnect-mini-app@npm:1.2.6": - version: 1.2.6 - resolution: "@walmart/wmconnect-mini-app@npm:1.2.6" +"@walmart/wmconnect-mini-app@npm:1.3.0": + version: 1.3.0 + resolution: "@walmart/wmconnect-mini-app@npm:1.3.0" dependencies: "@react-native-async-storage/async-storage": "npm:^1.21.0" "@react-native-community/netinfo": "npm:^11.0.1" @@ -6210,7 +6210,7 @@ __metadata: redux: "npm:^4.2.1" redux-saga: "npm:^1.2.3" wifi-store-locator: "npm:1.4.1" - checksum: 10c0/093be8e13e82de856a4c6e57d799807d03080d4f7ff8007d9f60744ada366e06f0885b5bf7fc3fb1253ca6692553bc14761fd4e75331f87506620b33e86b5f1b + checksum: 10c0/fddb6650394eb3adf445bfc21aa719dc00e8196bbcd4bea52fe5225297cff1a45ce96743d7042b507c53090b42f8c451362ac0bc59f0c8d4b0dd6956a68eee06 languageName: node linkType: hard
Update package
Update package
6f647febcd3fbc0018feba255171678631ffbcb6
--- ios/BuildSupport/Allspark_MeAtWM_Beta_InHouse_Profile.mobileprovision Binary files a/ios/BuildSupport/Allspark_MeAtWM_Beta_InHouse_Profile.mobileprovision and b/ios/BuildSupport/Allspark_MeAtWM_Beta_InHouse_Profile.mobileprovision differ
updating provisioning profile
updating provisioning profile
978e802c73057e376c4c2fb8b6dcf7dd37bc012e
--- package.json @@ -97,9 +97,9 @@ "@walmart/react-native-shared-navigation": "6.1.4", "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "3.7.0", - "@walmart/roster-mini-app": "2.6.0", + "@walmart/roster-mini-app": "2.7.0", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "2.4.0", + "@walmart/wmconnect-mini-app": "2.4.1", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", --- yarn.lock @@ -6276,9 +6276,9 @@ __metadata: "@walmart/react-native-shared-navigation": "npm:6.1.4" "@walmart/react-native-sumo-sdk": "npm:2.6.0" "@walmart/redux-store": "npm:3.7.0" - "@walmart/roster-mini-app": "npm:2.6.0" + "@walmart/roster-mini-app": "npm:2.7.0" "@walmart/ui-components": "npm:1.15.1" - "@walmart/wmconnect-mini-app": "npm:2.4.0" + "@walmart/wmconnect-mini-app": "npm:2.4.1" babel-jest: "npm:^29.2.1" chance: "npm:^1.1.11" eslint: "npm:8.22.0" @@ -6458,9 +6458,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:2.6.0": - version: 2.6.0 - resolution: "@walmart/roster-mini-app@npm:2.6.0" +"@walmart/roster-mini-app@npm:2.7.0": + version: 2.7.0 + resolution: "@walmart/roster-mini-app@npm:2.7.0" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6502,7 +6502,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/df01c60f610a718db1d255a55bceb3aa6eb0df922801b59f88dfd1cf205964ba9e54190bdf4fbc7f43d59889b0f45efa9ed69fca9b017add856b60f257c82f19 + checksum: 10c0/3168ad188ef389e2f57ddcdd5a52b73199af36454be9ed7fc1fa3ea468cbf0d3d05e9973f89853259b8d01ca5a5b06c4be2febd1113736df898209bb486a8dcd languageName: node linkType: hard @@ -6526,9 +6526,9 @@ __metadata: languageName: node linkType: hard -"@walmart/wmconnect-mini-app@npm:2.4.0": - version: 2.4.0 - resolution: "@walmart/wmconnect-mini-app@npm:2.4.0" +"@walmart/wmconnect-mini-app@npm:2.4.1": + version: 2.4.1 + resolution: "@walmart/wmconnect-mini-app@npm:2.4.1" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6568,7 +6568,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/66cc0aa6f3bac72f6c18667e198c5cb95738cfd9a167ec09a8e1f28f64a9bdf1cabc4d1fb4ced10df7cb024677811420416b6b70f9a2f71122735fc978ed159c + checksum: 10c0/97a9b527b354b61bd532f03ef8868cca3043d45d921823954027d60194af53943dee3b65fa812fd2a4c9c6b3f48ec7532037e925ace48063ff299ed75296b56b languageName: node linkType: hard
feat(ui): update version SMDV-5955
feat(ui): update version SMDV-5955
8bdb59cba4d9c9f14a5b89171c57065640760dbb
--- ios/Podfile.lock @@ -356,7 +356,7 @@ PODS: - React - react-native-webview (10.10.0): - React-Core - - react-native-wm-barcode (2.25.0): + - react-native-wm-barcode (2.29.0): - React - react-native-wm-voice-text (0.4.1): - React @@ -814,7 +814,7 @@ SPEC CHECKSUMS: react-native-video: 8d97379f3c2322a569f1e27542ad1a646cad9444 react-native-view-shot: 08c46c9e8e92f6681e8f2ffa55ac3d06e7e99070 react-native-webview: 2e330b109bfd610e9818bf7865d1979f898960a7 - react-native-wm-barcode: eeee6215ce0f2969b7648fee8015745d175269ce + react-native-wm-barcode: 881d483f23fba207961884289c00ff79cd1fac94 react-native-wm-voice-text: 80c0b59ff0fab4daf179ee430e4ea285181e3891 React-RCTActionSheet: 910163b6b09685a35c4ebbc52b66d1bfbbe39fc5 React-RCTAnimation: 9a883bbe1e9d2e158d4fb53765ed64c8dc2200c6 --- package-lock.json @@ -3172,9 +3172,9 @@ "integrity": "sha512-ooH0AqLGhS5PNcLaOWRHAEIIvrYIyTUXqshlHkgEKDLhLtGW8WvFu0mlcCXb1FEUc/PVmKEzHNHYV1gzGNBqxQ==" }, "@walmart/react-native-logger": { - "version": "1.25.0", - "resolved": "https://npme.walmart.com/@walmart/react-native-logger/-/react-native-logger-1.25.0.tgz", - "integrity": "sha512-Phn9ohuTTfIt9pXO3mjOxKMq8Twc1c8sTD8GbpZX24V8F2l8X3OvRngyxymaldP5+cYZeFBch/wya+Wk1sucvQ==" + "version": "1.26.0", + "resolved": "https://npme.walmart.com/@walmart/react-native-logger/-/react-native-logger-1.26.0.tgz", + "integrity": "sha512-+3oS/C6w3EqIJwWwhqnnwQz06sDBXxhW0oPmybzAmpCqbBAvzWKdOy41oizfjXrPqkFzPldGT3V8C0HbCdZrHg==" }, "@walmart/react-native-shared-navigation": { "version": "0.4.0", --- package.json @@ -76,7 +76,7 @@ "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.5.21", "@walmart/react-native-env": "^0.1.0", - "@walmart/react-native-logger": "^1.25.0", + "@walmart/react-native-logger": "^1.26.0", "@walmart/react-native-shared-navigation": "^0.4.0", "@walmart/redux-store": "^1.0.12", "@walmart/schedule-mini-app": "0.2.76",
updated podfile.lock and logger version to the latest
updated podfile.lock and logger version to the latest
08c475af41f7f2d71e99e4e3763f4c6d59748f5f
--- src/components/Roster/Roster.tsx @@ -14,6 +14,7 @@ import {useSelector} from 'react-redux'; import {teamLeadJobDescriptions} from '../../redux/selectors'; import {logger} from '../../logger/Logger'; import {AssociateListItem} from './AssociateListItem'; +import {filterAssociatesBySearchInput} from './search'; //TODO: States to verify: No Data, Loading, Error (identify all types of errors), Success export const Roster: React.FC<RosterProps> = (props) => { @@ -98,6 +99,14 @@ export const Roster: React.FC<RosterProps> = (props) => { rosterDataOverride?.associates, ]); + useEffect(() => { + const filteredAssociates = filterAssociatesBySearchInput( + associates, + associateListSearchQuery, + ); + setAssociates(filteredAssociates); + }, [associateListSearchQuery]); + return ( <View style={styles.screen}> <FlashList --- src/components/Roster/search.ts @@ -1,10 +1,14 @@ import {AssociateRosterItem} from './types'; import {associateDisplayName} from '../../utils'; +import { isNil } from "lodash"; export const filterAssociatesBySearchInput = ( associates: AssociateRosterItem[], - searchInput: string, + searchInput: string | null, ) => { + if (isNil(searchInput) || searchInput.length === 0) { + return associates; + } return associates.filter((associate) => { return ( associateDisplayName(associate)
applying search query to associates
applying search query to associates
0c1efbe8b7cff42a937702ada6fb5d6fc3bee78f
--- core/__tests__/features/inboxTest.tsx @@ -5,7 +5,6 @@ import {fireEvent, render} from '@testing-library/react-native'; import {useNavigation} from '@react-navigation/native'; import {DefaultNotificationTile} from '@walmart/ui-components'; import {InboxContainer} from '@walmart/me-at-walmart-common'; -import {useOneClick} from '../../src/oneClick/useOneClick'; import { registerInboxComponents, @@ -14,7 +13,12 @@ import { const navigation = useNavigation(); const mockUseSelector = useSelector as jest.Mock; -jest.mock('../../src/oneClick/useOneClick'); + +const mockUseOneClick = jest.fn((props) => props); + +jest.mock('../../src/oneClick/useOneClick', () => ({ + useOneClick: (id: string) => mockUseOneClick(id), +})); describe('InboxHeaderRight', () => { test('has expected behavior', () => { @@ -24,7 +28,7 @@ describe('InboxHeaderRight', () => { // With Badge Count (useBadgeCount as jest.Mock).mockReturnValueOnce({showBadge: true}); mockUseSelector.mockReturnValueOnce(true); //enabled - (useOneClick as jest.Mock).mockReturnValue(() => ({enable: true})); //!enabled + mockUseOneClick.mockReturnValueOnce({enable: true}); //*enabled const {getByTestId, queryByTestId, update} = render(<InboxHeaderRight />); expect(queryByTestId('headerBadge')).toBeTruthy(); @@ -35,13 +39,13 @@ describe('InboxHeaderRight', () => { // Without Badge Count (useBadgeCount as jest.Mock).mockReturnValueOnce({showBadge: false}); mockUseSelector.mockReturnValueOnce(true); //enabled - (useOneClick as jest.Mock).mockReturnValue(() => ({enable: true})); //!enabled + mockUseOneClick.mockReturnValueOnce(() => ({enable: true})); //*enabled update(<InboxHeaderRight />); expect(queryByTestId('headerBadge')).toBeFalsy(); // Disabled (useBadgeCount as jest.Mock).mockReturnValueOnce({showBadge: true}); - (useOneClick as jest.Mock).mockReturnValue(() => ({enable: false})); //!disabled + mockUseOneClick.mockReturnValueOnce(() => ({enable: false})); //!disabled mockUseSelector.mockReturnValueOnce(false); //!disabled update(<InboxHeaderRight />); expect(queryByTestId('inboxHeaderIcon')).toBeFalsy(); --- core/src/features/inbox.tsx @@ -46,6 +46,7 @@ export const createInboxHeaderRight = const {showBadge} = useBadgeCount(); const enabled = useSelector(getInboxHeaderEnabled); const oneClick = useOneClick(MINI_APPS.INBOX); + console.log('🚀 ~ oneClick:', oneClick); const isInboxEnabled = enabled && oneClick.enable; const onPress = () => {
test fixes
test fixes
13d03b9ed0be4fc323709cc0e70801059cff5255
--- package.json @@ -37,7 +37,9 @@ "test": "jest --no-watchman", "verifyBranchName": "bash ./scripts/verifyBranchName.sh", "uploadBlobToAzure": "node ./scripts/dependencies-map/upload-to-azure/upload-to-azure.js", - "buildDependenciesMap": "node ./scripts/dependencies-map/deps-crawler/index.js -- -f -dm -dc path='./scripts/dependencies-map/config/deps-source.json' chunk_size=20" + "buildDependenciesMap": "node ./scripts/dependencies-map/deps-crawler/index.js -- -f -dm -dc path='./scripts/dependencies-map/config/deps-source.json' chunk_size=20", + "android": "expo run:android", + "ios": "expo run:ios" }, "dependencies": { "@apollo/client": "^3.8.6", @@ -142,7 +144,6 @@ "@walmart/store-feature-orders": "1.27.1", "@walmart/taskit-mini-app": "4.25.8", "@walmart/time-clock-mini-app": "2.448.1", - "@walmart/topstock-mini-app": "patch:@walmart/topstock-mini-app@npm%3A1.19.4#~/.yarn/patches/@walmart-topstock-mini-app-npm-1.19.4-f4b0e02cc2.patch", "@walmart/translator-mini-app": "1.3.7", "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.18.7#~/.yarn/patches/@walmart-ui-components-npm-1.18.7-9e23294b76.patch", "@walmart/walmart-fiscal-week": "^0.3.6", --- src/navigation/USHallway/AssociateHallwayNav/MainStackNav.tsx @@ -62,7 +62,7 @@ import { StoreFeatureOrderHistoryMiniApp, } from '@walmart/store-feature-orders'; import {TaskItQuickActions, AlarmDetailNav} from '@walmart/taskit-mini-app'; -import {TopstockMiniApp} from '@walmart/topstock-mini-app'; +// import {TopstockMiniApp} from '@walmart/topstock-mini-app'; import {WmPlusMiniApp} from '@walmart/wm-plus-mini-app'; import {MeganavTextingScreen} from '@walmart/wmconnect-mini-app'; import TranslatorFeature from '@walmart/translator-mini-app'; @@ -119,15 +119,15 @@ const MiniAppScreens = createMiniAppScreens(MainStack, [ }, clockCheckEnabled: true, }, - { - featureId: MINI_APPS.TOPSTOCK, - name: 'Topstock', - component: TopstockMiniApp, - options: { - headerShown: false, - }, - clockCheckEnabled: true, - }, + // { + // featureId: MINI_APPS.TOPSTOCK, + // name: 'Topstock', + // component: TopstockMiniApp, + // options: { + // headerShown: false, + // }, + // clockCheckEnabled: true, + // }, { featureId: MINI_APPS.ITEM_INFO, name: 'itemInfo', --- yarn.lock @@ -7008,7 +7008,6 @@ __metadata: "@walmart/store-feature-orders": "npm:1.27.1" "@walmart/taskit-mini-app": "npm:4.25.8" "@walmart/time-clock-mini-app": "npm:2.448.1" - "@walmart/topstock-mini-app": "patch:@walmart/topstock-mini-app@npm%3A1.19.4#~/.yarn/patches/@walmart-topstock-mini-app-npm-1.19.4-f4b0e02cc2.patch" "@walmart/translator-mini-app": "npm:1.3.7" "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.18.7#~/.yarn/patches/@walmart-ui-components-npm-1.18.7-9e23294b76.patch" "@walmart/walmart-fiscal-week": "npm:^0.3.6" @@ -7997,52 +7996,6 @@ __metadata: languageName: node linkType: hard -"@walmart/topstock-mini-app@npm:1.19.4": - version: 1.19.4 - resolution: "@walmart/topstock-mini-app@npm:1.19.4" - peerDependencies: - "@react-native-firebase/app": ^15.1.1 - "@react-native-firebase/crashlytics": ^15.1.1 - "@react-navigation/native": ">=5.8.10" - "@react-navigation/stack": ">=5.12.8" - "@walmart/core-services": ~2.0.11 - "@walmart/core-services-allspark": ~2.8.4 - "@walmart/gtp-shared-components": ">=2.0.3" - "@walmart/react-native-env": ">=0.1.0" - "@walmart/redux-store": ">=1.0.10" - "@walmart/ui-components": ">=1.0.79" - i18next: ">=19.5.1" - react-i18next: ">=11.7.3" - react-native-haptic-feedback: ^1.13.0 - react-native-vector-icons: ">=6.6.0" - react-redux: ">=7.2.0" - checksum: 10c0/4f7516a602f2a7d6775ce26301fa106a1eb7433cfb8601303f5a3a3dee57f4d5dd5cf43034e66a6cba4b1640b4976bb181c5544d6c171039be2d665260cc33b0 - languageName: node - linkType: hard - -"@walmart/topstock-mini-app@patch:@walmart/topstock-mini-app@npm%3A1.19.4#~/.yarn/patches/@walmart-topstock-mini-app-npm-1.19.4-f4b0e02cc2.patch": - version: 1.19.4 - resolution: "@walmart/topstock-mini-app@patch:@walmart/topstock-mini-app@npm%3A1.19.4#~/.yarn/patches/@walmart-topstock-mini-app-npm-1.19.4-f4b0e02cc2.patch::version=1.19.4&hash=250505" - peerDependencies: - "@react-native-firebase/app": ^15.1.1 - "@react-native-firebase/crashlytics": ^15.1.1 - "@react-navigation/native": ">=5.8.10" - "@react-navigation/stack": ">=5.12.8" - "@walmart/core-services": ~2.0.11 - "@walmart/core-services-allspark": ~2.8.4 - "@walmart/gtp-shared-components": ">=2.0.3" - "@walmart/react-native-env": ">=0.1.0" - "@walmart/redux-store": ">=1.0.10" - "@walmart/ui-components": ">=1.0.79" - i18next: ">=19.5.1" - react-i18next: ">=11.7.3" - react-native-haptic-feedback: ^1.13.0 - react-native-vector-icons: ">=6.6.0" - react-redux: ">=7.2.0" - checksum: 10c0/0aea7a29f87248d650e6e86db9b023eaabb99596983e7a08b45636ec9076e9ffff770e7c8e3b59f1cfa37fdfa4302d88a79d7b34d6a2d379f30d293d2774ee11 - languageName: node - linkType: hard - "@walmart/translator-mini-app@npm:1.3.7": version: 1.3.7 resolution: "@walmart/translator-mini-app@npm:1.3.7"
fix: removing topstock mini app to unblock RN upgrade
fix: removing topstock mini app to unblock RN upgrade
67c382eddaa76ecd16c3c668e88882db09489433
--- packages/me-at-walmart-common/src/types.ts @@ -9,3 +9,5 @@ export enum UserType { associate = 'associate', prehire = 'pre_hire', } + +export type IMeAtWalmartSetupTypes = 'root' | 'associate' | 'pre_hire';
feat: add container setup types for use with dynamic container setup
feat: add container setup types for use with dynamic container setup
271cce7dd8380539d8817b852ffb1736b7d9109c
--- package-lock.json @@ -69,7 +69,7 @@ "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", "@walmart/react-native-logger": "1.33.0", - "@walmart/react-native-scanner-3.0": "0.2.0", + "@walmart/react-native-scanner-3.0": "0.2.1", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.5.1", @@ -5806,9 +5806,9 @@ } }, "node_modules/@walmart/react-native-scanner-3.0": { - "version": "0.2.0", - "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.2.0.tgz", - "integrity": "sha512-GkIMsrIJeZNHgfIzbq+dK7MDcKRIzs1Z9L8GEuTytP38hxlUGQPHPzKVKfkveYvihynKtAPJ8wAyuyTQEhYepg==", + "version": "0.2.1", + "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.2.1.tgz", + "integrity": "sha512-1b8IJIj2yRxWbIR/bGGAjgDEJjxAo/LEDvcgQ/kkniO7ZCVBy9i8MQqJP5rgwPQorY0e78Rqiu29i+Dtdi5Myg==", "license": "ISC", "peerDependencies": { "react-native": ">=0.47.1" @@ -25383,9 +25383,9 @@ "version": "1.33.0" }, "@walmart/react-native-scanner-3.0": { - "version": "0.2.0", - "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.2.0.tgz", - "integrity": "sha512-GkIMsrIJeZNHgfIzbq+dK7MDcKRIzs1Z9L8GEuTytP38hxlUGQPHPzKVKfkveYvihynKtAPJ8wAyuyTQEhYepg==" + "version": "0.2.1", + "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.2.1.tgz", + "integrity": "sha512-1b8IJIj2yRxWbIR/bGGAjgDEJjxAo/LEDvcgQ/kkniO7ZCVBy9i8MQqJP5rgwPQorY0e78Rqiu29i+Dtdi5Myg==" }, "@walmart/react-native-shared-navigation": { "version": "1.0.2", --- package.json @@ -111,7 +111,7 @@ "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", "@walmart/react-native-logger": "1.33.0", - "@walmart/react-native-scanner-3.0": "0.2.0", + "@walmart/react-native-scanner-3.0": "0.2.1", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.5.1",
Updated scanner 3.0 version to 0.2.1
Updated scanner 3.0 version to 0.2.1
083ec8d81d15eac955db8ecd32ae491f27996d8f
--- __tests__/home/components/TaskCard/__snapshots__/indexTest.tsx.snap @@ -10,9 +10,6 @@ exports[`TaskCard doesnt render clock status if config value is false 1`] = ` Object { "backgroundColor": "red", }, - Object { - "display": "flex", - }, ] } testID="taskCard" @@ -51,9 +48,6 @@ exports[`TaskCard matches team view 1 if config version is 1 1`] = ` Object { "backgroundColor": "red", }, - Object { - "display": "flex", - }, ] } testID="taskCard" @@ -103,9 +97,6 @@ exports[`TaskCard should not render if copilot is enabled 1`] = ` Object { "backgroundColor": "red", }, - Object { - "display": "none", - }, ] } testID="taskCard" @@ -133,17 +124,6 @@ exports[`TaskCard should not render if copilot is enabled 1`] = ` } } /> - <TaskCards - onRefreshEnd={[MockFunction]} - onRefreshStart={[MockFunction]} - refresh={false} - refreshKey="TaskCard" - style={ - Object { - "backgroundColor": "red", - } - } - /> </View> `; @@ -155,9 +135,6 @@ exports[`TaskCard should render teamCard2 1`] = ` Object { "backgroundColor": "red", }, - Object { - "display": "flex", - }, ] } testID="taskCard" @@ -207,9 +184,6 @@ exports[`TaskCard shows card if clocked in and store view of no teams 1`] = ` Object { "backgroundColor": "red", }, - Object { - "display": "flex", - }, ] } testID="taskCard" @@ -259,9 +233,6 @@ exports[`TaskCard shows team view if clocked in and teams present 1`] = ` Object { "backgroundColor": "red", }, - Object { - "display": "flex", - }, ] } testID="taskCard" --- package-lock.json @@ -81,7 +81,7 @@ "@walmart/schedule-mini-app": "0.37.0", "@walmart/settings-mini-app": "1.18.1", "@walmart/shelfavailability-mini-app": "1.5.16", - "@walmart/taskit-mini-app": "^2.40.0", + "@walmart/taskit-mini-app": "2.40.3", "@walmart/time-clock-mini-app": "2.98.0", "@walmart/topstock-mini-app": "1.0.6", "@walmart/ui-components": "1.15.0", @@ -6004,9 +6004,9 @@ } }, "node_modules/@walmart/taskit-mini-app": { - "version": "2.40.0", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.40.0.tgz", - "integrity": "sha512-Yj9vUThOswTmvk3BNSo6hEG5F/rGrbLZfJICRSzQEx1DTDTb3ltjIHKCDyA6Q8wlAzoqtHJjZPPnH/W1Idfz0w==", + "version": "2.40.3", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.40.3.tgz", + "integrity": "sha512-eXG9NXxRPPbeTKR06/ajP7f4Zvr8G/sANHb1IhVkhQkTY4eQV8ZkBBxnrWyDXZvec2HLNicr29RWdxoWUyy6iQ==", "peerDependencies": { "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@types/lodash": ">=4.14.176", @@ -25399,9 +25399,9 @@ "version": "1.5.16" }, "@walmart/taskit-mini-app": { - "version": "2.40.0", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.40.0.tgz", - "integrity": "sha512-Yj9vUThOswTmvk3BNSo6hEG5F/rGrbLZfJICRSzQEx1DTDTb3ltjIHKCDyA6Q8wlAzoqtHJjZPPnH/W1Idfz0w==" + "version": "2.40.3", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.40.3.tgz", + "integrity": "sha512-eXG9NXxRPPbeTKR06/ajP7f4Zvr8G/sANHb1IhVkhQkTY4eQV8ZkBBxnrWyDXZvec2HLNicr29RWdxoWUyy6iQ==" }, "@walmart/tcnumber": { "version": "2.3.3", --- package.json @@ -123,7 +123,7 @@ "@walmart/schedule-mini-app": "0.37.0", "@walmart/settings-mini-app": "1.18.1", "@walmart/shelfavailability-mini-app": "1.5.16", - "@walmart/taskit-mini-app": "^2.40.0", + "@walmart/taskit-mini-app": "2.40.3", "@walmart/time-clock-mini-app": "2.98.0", "@walmart/topstock-mini-app": "1.0.6", "@walmart/ui-components": "1.15.0", --- src/home/components/TaskCard/index.tsx @@ -36,13 +36,7 @@ export const TaskCard: FC<TaskCardProps> = (props) => { const tmsVersion = useHomeAppConfig('tmsVersion', TMS_VERSION_2); return isClockedIn ? ( - <View - style={[ - styles.container, - style, - copilot.enabled ? styles.disableCard : styles.enableCard, - ]} - testID='taskCard'> + <View style={[styles.container, style]} testID='taskCard'> <Headline style={styles.titleText}> {t('teams.teamTaskTitle', {context})} </Headline> @@ -59,7 +53,7 @@ export const TaskCard: FC<TaskCardProps> = (props) => { )} </> )} - <TaskCards {...props} /> + {!copilot.enabled && <TaskCards {...props} />} </View> ) : null; }; --- src/home/components/TaskCard/styles.ts @@ -49,10 +49,4 @@ export default StyleSheet.create({ viewRosterButton: { alignSelf: 'flex-start', }, - enableCard: { - display: 'flex', - }, - disableCard: { - display: 'none', - }, });
updated taskit version
updated taskit version
31c0917058fb5e718815af5cee04d45f381dbbc3
--- package.json @@ -153,7 +153,7 @@ "@walmart/react-native-cookies": "1.0.1", "@walmart/react-native-encrypted-storage": "~1.1.3", "@walmart/react-native-logger": "patch:@walmart/react-native-logger@npm%3A1.38.1#~/.yarn/patches/@walmart-react-native-logger-npm-1.38.1-592e25ca20.patch", - "@walmart/react-native-scanner-3.0": "0.17.3", + "@walmart/react-native-scanner-3.0": "0.17.5", "@walmart/react-native-shared-navigation": "~6.3.28", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.9.0-alpha.2", --- yarn.lock @@ -8891,7 +8891,7 @@ __metadata: "@walmart/react-native-cookies": "npm:1.0.1" "@walmart/react-native-encrypted-storage": "npm:~1.1.3" "@walmart/react-native-logger": "patch:@walmart/react-native-logger@npm%3A1.38.1#~/.yarn/patches/@walmart-react-native-logger-npm-1.38.1-592e25ca20.patch" - "@walmart/react-native-scanner-3.0": "npm:0.17.3" + "@walmart/react-native-scanner-3.0": "npm:0.17.5" "@walmart/react-native-shared-navigation": "npm:~6.3.28" "@walmart/react-native-store-map": "npm:0.3.7" "@walmart/react-native-sumo-sdk": "npm:2.9.0-alpha.2" @@ -9500,12 +9500,12 @@ __metadata: languageName: node linkType: hard -"@walmart/react-native-scanner-3.0@npm:0.17.3": - version: 0.17.3 - resolution: "@walmart/react-native-scanner-3.0@npm:0.17.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freact-native-scanner-3.0%2F-%2F%40walmart%2Freact-native-scanner-3.0-0.17.3.tgz" +"@walmart/react-native-scanner-3.0@npm:0.17.5": + version: 0.17.5 + resolution: "@walmart/react-native-scanner-3.0@npm:0.17.5::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freact-native-scanner-3.0%2F-%2F%40walmart%2Freact-native-scanner-3.0-0.17.5.tgz" peerDependencies: react-native: ">=0.47.1" - checksum: 10c0/0e73367f06032aa054073801e4977bf1d9cf0731f52e2e5197a240ad3bcd72c8a517ba08513204e859efc6c91fc38336ba2a3b64cf961643ddbf169a33c97853 + checksum: 10c0/acf13fbf8564f9747ba31df44cf60dce14a29b1b8c7f0007b312e941ad9c24f9e50d78273706b16ee552771f806a022613f7dddcca4c6b86bed4841832968e2f languageName: node linkType: hard
feat: VS9403-Scandit downgrade to 7.2.5-Drop35 (#5235)
feat: VS9403-Scandit downgrade to 7.2.5-Drop35 (#5235) Co-authored-by: Hitesh Arora - h0a006n <Hitesh.Arora@walmart.com>