commit_hash stringlengths 40 40 | input stringlengths 13 7.99k | output stringlengths 5 155 | full_message stringlengths 6 8.96k |
|---|---|---|---|
6bfb1d35d84f20f64c81e9b09144a21c97a600fa | --- .looper-pr.yml
@@ -32,4 +32,3 @@ envs:
-
| feat(ui): update concord SMDV-9999 | feat(ui): update concord SMDV-9999
|
0d19fa434781b456f51607c90e17072677ec935c | --- __tests__/core/RootContainerTest.tsx
@@ -113,8 +113,8 @@ describe('RootContainer', () => {
});
describe('onImport', () => {
- it('calls expected functions', () => {
- onImport();
+ it('calls expected functions', async () => {
+ await onImport();
expect(initEnv).toHaveBeenCalled();
expect(addSSOListeners).toHaveBeenCalled();
--- __tests__/core/__snapshots__/RootContainerTest.tsx.snap
@@ -21,17 +21,12 @@ exports[`RootContainer renders and fires startup event 1`] = `
"getState": [MockFunction] {
"calls": Array [
Array [],
- Array [],
],
"results": Array [
Object {
"type": "return",
"value": Object {},
},
- Object {
- "type": "return",
- "value": Object {},
- },
],
},
}
--- package-lock.json
@@ -13163,27 +13163,27 @@
"react-native-wm-config": {
"version": "0.1.1",
"resolved": "https://npme.walmart.com/react-native-wm-config/-/react-native-wm-config-0.1.1.tgz",
- "integrity": "sha1-Nn+tRZascRxL031AMLmpsn4nbB4="
+ "integrity": "sha512-s3S3bciDoyVqUyfzVKsXJp+aQxPriU62yL+cvbBJB6d7sGnCFHDQHF7/2y8YfK4Qc756VQ2o3SgCzlcQEYoTEw=="
},
"react-native-wm-network": {
"version": "0.1.0",
"resolved": "https://npme.walmart.com/react-native-wm-network/-/react-native-wm-network-0.1.0.tgz",
- "integrity": "sha1-FagRyJUW+/eIfL/NqCnPfrY632I="
+ "integrity": "sha512-lDgyoghNlFRRCK0ET3vYy+HzYK0sENPxs77RkHbkr1VxY2vMlC8MbyU5Hg13ORnDf7qst5A0bVz2bocVHR2k8Q=="
},
"react-native-wm-notification": {
"version": "2.0.0",
"resolved": "https://npme.walmart.com/react-native-wm-notification/-/react-native-wm-notification-2.0.0.tgz",
- "integrity": "sha1-48bg0mzjuQpCaLOjUbwd+z20aj8="
+ "integrity": "sha512-TqMxfERxOKomh3P9hGh0lGUTTLv5X6zCZMF2xXJp3hggtbT0l1o0LN5/S+ptR3QdEO48TxHLtWC0LgstkJ/UYQ=="
},
"react-native-wm-telemetry": {
"version": "0.3.0",
"resolved": "https://npme.walmart.com/react-native-wm-telemetry/-/react-native-wm-telemetry-0.3.0.tgz",
- "integrity": "sha1-8QwZvpngLi+J6pHSOcu+5HqQcLs="
+ "integrity": "sha512-zTOSJ7BMbGHaqAF8+LDQI/s5winKcxsHSe4hv49gUbfDz19v71apgNchz31W1D2UQP+kNgrglrmCdmr5RdI8mw=="
},
"react-native-wm-voice-text": {
"version": "0.5.0",
"resolved": "https://npme.walmart.com/react-native-wm-voice-text/-/react-native-wm-voice-text-0.5.0.tgz",
- "integrity": "sha1-BCBLE9teUsdgAcNTXImFU/p4Niw="
+ "integrity": "sha512-PKaL0MFy+VjTT4wcx/v90BlvlRXgdWGUU8Sz/760A2Esj175A8w/vFQCtZhUer5FVxmpYVKk7nHzoewii4ygRw=="
},
"react-query": {
"version": "3.34.8",
@@ -14186,7 +14186,7 @@
"squiggly-localization": {
"version": "0.0.2",
"resolved": "https://npme.walmart.com/squiggly-localization/-/squiggly-localization-0.0.2.tgz",
- "integrity": "sha1-3ksz5Io53VPnUBiRSVDpxDaSGHU="
+ "integrity": "sha512-9j/XUl0XvLk5wksN/nhOcRHmHesVHopX7v3Z1Hv398/656CLarKW0FAqL28zjKO68YH566s8PM1gflrAayBuMA=="
},
"sshpk": {
"version": "1.16.1",
@@ -15446,7 +15446,7 @@
"wfm-allspark-data-library": {
"version": "0.0.11",
"resolved": "https://npme.walmart.com/wfm-allspark-data-library/-/wfm-allspark-data-library-0.0.11.tgz",
- "integrity": "sha1-E27LsiPO+Sbj5h3p0FQpcH9VU8g=",
+ "integrity": "sha512-o34ej3nNhCcy3uwWkOJcU/3zjXmX+VvbqiZrEgQwrxbO6cbJGxiK1Tz/JQX8j1lwi6cZFJKvDOucJtlduzVQrg==",
"requires": {
"@walmart/functional-components": "^1.0.22",
"@walmart/react-native-env": "^0.1.0",
@@ -15460,7 +15460,7 @@
"@walmart/react-native-env": {
"version": "0.1.0",
"resolved": "https://npme.walmart.com/@walmart/react-native-env/-/react-native-env-0.1.0.tgz",
- "integrity": "sha1-ojNwDE5pPTzF1RuQXDc//Fnlpz0="
+ "integrity": "sha512-ooH0AqLGhS5PNcLaOWRHAEIIvrYIyTUXqshlHkgEKDLhLtGW8WvFu0mlcCXb1FEUc/PVmKEzHNHYV1gzGNBqxQ=="
},
"moment": {
"version": "2.24.0",
@@ -15470,7 +15470,7 @@
"react-native-ssmp-sso-allspark": {
"version": "0.0.1-rc8",
"resolved": "https://npme.walmart.com/react-native-ssmp-sso-allspark/-/react-native-ssmp-sso-allspark-0.0.1-rc8.tgz",
- "integrity": "sha1-/SHw48C+3muBMp2bynExhYPZl0s="
+ "integrity": "sha512-4ZWTteIvddzP7Lg3EM0KP1fDfcN8nx7v5yvHASCLUpoZvhxHQUkjj8uTt4TkJxvTuEK16w7mTwHDauTrIC/BJg=="
}
}
},
@@ -15527,12 +15527,12 @@
"wifi-store-locator": {
"version": "1.0.0-alpha2",
"resolved": "https://npme.walmart.com/wifi-store-locator/-/wifi-store-locator-1.0.0-alpha2.tgz",
- "integrity": "sha1-W1OXsVMHI8dYMcI0QKg6pJO/R3Q="
+ "integrity": "sha512-Gj0fP/NwQAguJrxEuRuHQjlUHDDH2qnFZAGgh1R0l1CUAPKFROL8L8gHZ1GDKnfoYMev7AOXKcEbZVcXpNomOg=="
},
"wm-react-native-vector-icons": {
"version": "1.0.33",
"resolved": "https://npme.walmart.com/wm-react-native-vector-icons/-/wm-react-native-vector-icons-1.0.33.tgz",
- "integrity": "sha1-vIAL0WOWBBaAsIuacYHnzsxTQxk=",
+ "integrity": "sha512-pAcEq6iOVxzKM55qucKOkh2ML3kii4yGJ5YdmMEOcRAGH4fQ1lHa7BETIl+jzX5n1ZVKgWkzmAiH3vw0nkuklQ==",
"requires": {
"lodash": "^4.0.0",
"prop-types": "^15.6.2",
--- src/core/RootContainer.tsx
@@ -36,7 +36,7 @@ import {initAppVersions} from './versionsInit';
import {initCellularDataSaverSaga} from './dataSaverInit';
import {initSsoFeedback} from '../ssoFeedback';
-export const onImport = () => {
+export const onImport = async () => {
addSSOListeners();
initEnv();
initDeviceInfo();
@@ -50,7 +50,7 @@ export const onImport = () => {
initAppConfig();
initUpdateCheck();
initNavConfig();
- initTranslations();
+ await initTranslations();
initAppVersions();
initPermissions();
initBiometrics();
| versions screen not loading | versions screen not loading
|
24411860559c3d1492833fc13aa8f2abe815c7ba | --- android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
- <uses-permission android:name="android.permission.BIND_DEVICE_ADMIN" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
<uses-permission android:name="android.permission.USE_FINGERPRINT" />
| androidmanifest file permission removed | androidmanifest file permission removed
|
aaeeff723a7165f4bba1b9aa02da3b6e1af6d107 | --- example/src/index.ts
@@ -2,6 +2,7 @@ import {AllsparkFeatureRunner} from '@walmart/allspark-foundation/FeatureRunner'
import {TestContainer} from './container';
import Feature1 from './feature1';
import Feature2 from './feature2';
+import Feature3 from './feature3';
import Onboarding from './Onboarding';
export const Feature1Standalone = new AllsparkFeatureRunner(
@@ -20,6 +21,14 @@ export const Feature2Standalone = new AllsparkFeatureRunner(
},
);
+export const Feature3Standalone = new AllsparkFeatureRunner(
+ TestContainer,
+ Feature3,
+ {
+ env: 'dev',
+ },
+);
+
export const OnboardingStandalone = new AllsparkFeatureRunner(
TestContainer,
Onboarding,
--- packages/allspark-foundation/src/Feature/AllsparkFeatureManager.ts
@@ -76,7 +76,7 @@ export class FeatureModuleManager {
* @example
* const featureManager = new FeatureModuleManager();
* const features = featureManager.getFeatures();
- * console.log(features); // [Feature1, Feature2, Onboarding]
+ * console.log(features); // [Feature1, Feature2, Feature3]
*/
public getAllFeatures() {
return Array.from(this._featureMap.values());
--- react-native.config.js
@@ -1,7 +0,0 @@
-module.exports = {
- project: {
- ios: {},
- android: {},
- },
- assets: ['./node_modules/@walmart/gtp-shared-components/assets/fonts'],
-};
| feat: remove react-native config | feat: remove react-native config
|
318848ce828150055cf97d9fac5e07dc7a68052d | --- README.md
@@ -295,4 +295,3 @@ With each React Native release, Expo will release a corresponding SDK. Follow th
- Make sure you're on the correct versions (See Prerequisites)
- Make sure you've built the project from the root folder.
- Make sure you've run the `certifyBootedSim.sh` script.
-
| feat(item-info): Update iteminfoini app version for drop34 | feat(item-info): Update iteminfoini app version for drop34
|
9a53b9a7b368104ddb70173eeeeb62e32c9b54d4 | --- core/__tests__/permissions/IndexTest.ts
@@ -1,20 +1,37 @@
-import {PermissionsFeature} from '../../src/permissions'
+import {PermissionsFeature} from '../../src/permissions';
import {enUS, esMX} from '../../src/permissions//translations';
import {
- PERMISSION_WELCOME_SCREEN,
- PERMISSION_LOCATION_SCREEN,
- PERMISSION_NOTIFICATION_SCREEN,
- } from '../../src/permissions/constants';
+ PERMISSION_WELCOME_SCREEN,
+ PERMISSION_LOCATION_SCREEN,
+ PERMISSION_NOTIFICATION_SCREEN,
+} from '../../src/permissions/constants';
-describe('SettingsFeature', () => {
- it('render scrren correctly', () => {
- expect(PermissionsFeature._screens[PERMISSION_WELCOME_SCREEN].getComponent()).toBeInstanceOf(Function);
- expect(PermissionsFeature._screens[PERMISSION_LOCATION_SCREEN].getComponent()).toBeInstanceOf(Function);
- expect(PermissionsFeature._screens[PERMISSION_WELCOME_SCREEN].options.animationTypeForReplace).toBe('push');
- expect(PermissionsFeature._screens[PERMISSION_WELCOME_SCREEN].options.gestureEnabled).toBe(false);
- expect(PermissionsFeature._screens[PERMISSION_NOTIFICATION_SCREEN].options.headerShown).toBe(false);
- expect(PermissionsFeature._screens[PERMISSION_NOTIFICATION_SCREEN].getComponent()).toBeInstanceOf(Function);
- expect(PermissionsFeature._translations['en-US']).toEqual(enUS);
- expect(PermissionsFeature._translations['es-MX']).toEqual(esMX);
- });
- });
\ No newline at end of file
+describe('SettingsFeature', () => {
+ it('render scrren correctly', () => {
+ expect(
+ PermissionsFeature._screens[PERMISSION_WELCOME_SCREEN].getComponent(),
+ ).toBeInstanceOf(Function);
+ expect(
+ PermissionsFeature._screens[PERMISSION_LOCATION_SCREEN].getComponent(),
+ ).toBeInstanceOf(Function);
+ expect(
+ PermissionsFeature._screens[PERMISSION_WELCOME_SCREEN].options
+ .animationTypeForReplace,
+ ).toBe('push');
+ expect(
+ PermissionsFeature._screens[PERMISSION_WELCOME_SCREEN].options
+ .gestureEnabled,
+ ).toBe(false);
+ expect(
+ PermissionsFeature._screens[PERMISSION_NOTIFICATION_SCREEN].options
+ .headerShown,
+ ).toBe(false);
+ expect(
+ PermissionsFeature._screens[
+ PERMISSION_NOTIFICATION_SCREEN
+ ].getComponent(),
+ ).toBeInstanceOf(Function);
+ expect(PermissionsFeature._translations['en-US']).toEqual(enUS);
+ expect(PermissionsFeature._translations['es-MX']).toEqual(esMX);
+ });
+});
--- core/__tests__/settings/IndexTest.tsx
@@ -1,17 +1,33 @@
-import {SettingsFeature} from '../../src/settings'
+import {SettingsFeature} from '../../src/settings';
import {enUS, esMX} from '../../src/settings//translations';
-describe('SettingsFeature', () => {
- it('render scrren correctly', () => {
- expect(SettingsFeature._screens['Core.Settings'].getComponent()).toBeInstanceOf(Function);
- expect(SettingsFeature._screens['Settings.DataSaver'].getComponent()).toBeInstanceOf(Function);
- expect(SettingsFeature._screens['Settings.Notifications'].getComponent()).toBeInstanceOf(Function);
- expect(SettingsFeature._screens['Settings.PrivacyPreferences'].getComponent()).toBeInstanceOf(Function);
- expect(SettingsFeature._screens['Settings.TimeClock'].getComponent()).toBeInstanceOf(Function);
- expect(SettingsFeature._screens['Settings.Versions'].getComponent()).toBeInstanceOf(Function);
- expect(SettingsFeature._screens['Settings.Language'].getComponent()).toBeInstanceOf(Function);
- expect(SettingsFeature._screens['Settings.3rdPartyNotices'].getComponent()).toBeInstanceOf(Function);
- expect(SettingsFeature._translations['en-US']).toEqual(enUS);
- expect(SettingsFeature._translations['es-MX']).toEqual(esMX);
- });
- });
\ No newline at end of file
+describe('SettingsFeature', () => {
+ it('render scrren correctly', () => {
+ expect(
+ SettingsFeature._screens['Core.Settings'].getComponent(),
+ ).toBeInstanceOf(Function);
+ expect(
+ SettingsFeature._screens['Settings.DataSaver'].getComponent(),
+ ).toBeInstanceOf(Function);
+ expect(
+ SettingsFeature._screens['Settings.Notifications'].getComponent(),
+ ).toBeInstanceOf(Function);
+ expect(
+ SettingsFeature._screens['Settings.PrivacyPreferences'].getComponent(),
+ ).toBeInstanceOf(Function);
+ expect(
+ SettingsFeature._screens['Settings.TimeClock'].getComponent(),
+ ).toBeInstanceOf(Function);
+ expect(
+ SettingsFeature._screens['Settings.Versions'].getComponent(),
+ ).toBeInstanceOf(Function);
+ expect(
+ SettingsFeature._screens['Settings.Language'].getComponent(),
+ ).toBeInstanceOf(Function);
+ expect(
+ SettingsFeature._screens['Settings.3rdPartyNotices'].getComponent(),
+ ).toBeInstanceOf(Function);
+ expect(SettingsFeature._translations['en-US']).toEqual(enUS);
+ expect(SettingsFeature._translations['es-MX']).toEqual(esMX);
+ });
+});
| lint issue fix | lint issue fix
|
1ed71195ba65398a18ed58b563a7a5cfc02e77ad | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/roster-mini-app",
- "version": "2.54.0",
+ "version": "2.55.0",
"main": "dist/index.js",
"files": [
"dist"
@@ -85,7 +85,7 @@
"@typescript-eslint/parser": "^5.37.0",
"@walmart/allspark-authentication": "6.1.4",
"@walmart/allspark-foundation": "6.27.4",
- "@walmart/allspark-foundation-hub": "1.3.14",
+ "@walmart/allspark-foundation-hub": "1.3.15",
"@walmart/allspark-graphql-client": "^1.4.6",
"@walmart/allspark-http-client": "6.1.4",
"@walmart/config-components": "4.4.0",
--- yarn.lock
@@ -6078,9 +6078,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/allspark-foundation-hub@npm:1.3.14":
- version: 1.3.14
- resolution: "@walmart/allspark-foundation-hub@npm:1.3.14"
+"@walmart/allspark-foundation-hub@npm:1.3.15":
+ version: 1.3.15
+ resolution: "@walmart/allspark-foundation-hub@npm:1.3.15::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fallspark-foundation-hub%2F-%2Fallspark-foundation-hub-1.3.15.tgz"
dependencies:
"@reduxjs/toolkit": "npm:^1.9.7"
"@shopify/flash-list": "npm:~1.6.4"
@@ -6096,7 +6096,7 @@ __metadata:
react: "*"
react-native: "*"
react-native-safe-area-context: 4.x
- checksum: 10c0/5f80c2f6bb2bcd4c1c0865a56211f124baf9d9d937daeef9f92fc3b0022c69c8944d00b401b6eb4d65389b5e832bfc6eba9b4e196fda9ffc616aaab07db241eb
+ checksum: 10c0/bea4c0d15d9c2787514c88e1336cd862535f9e8ea4d0d8248f2003232dc0b1d3b9c5b3cfcec61eb8ee469c2042016029ead0a4065eb2a3eac45edeb3d9f8af36
languageName: node
linkType: hard
@@ -6547,7 +6547,7 @@ __metadata:
"@typescript-eslint/parser": "npm:^5.37.0"
"@walmart/allspark-authentication": "npm:6.1.4"
"@walmart/allspark-foundation": "npm:6.27.4"
- "@walmart/allspark-foundation-hub": "npm:1.3.14"
+ "@walmart/allspark-foundation-hub": "npm:1.3.15"
"@walmart/allspark-graphql-client": "npm:^1.4.6"
"@walmart/allspark-http-client": "npm:6.1.4"
"@walmart/config-components": "npm:4.4.0"
| Update the proximity changes for roster | Update the proximity changes for roster
|
f1f244919dc50c06b49d141edfa97c0e02653e05 | --- package.json
@@ -152,7 +152,7 @@
"rn-fetch-blob": "^0.12.0",
"seamless-immutable": "^7.1.4",
"semver": "^7.3.4",
- "uuid": "^8.3.2",
+ "uuid": "3.3.2",
"victory-native": "^35.0.1"
},
"devDependencies": {
| uuid version | uuid version
|
e264a25ffe26c933ab824a91d6243a54272cb77f | --- src/index.tsx
@@ -1,4 +1,4 @@
-import React, {Dispatch, useMemo, useReducer} from 'react';
+import React, {Dispatch, useEffect, useMemo, useReducer} from 'react';
import {useSelector} from 'react-redux';
import {firebase} from '@react-native-firebase/app-check';
@@ -25,6 +25,8 @@ import {
import {PresenceProvider} from './presence';
import {ChannelsProvider} from './channels';
import {RNFBConfigAndroid, RNFBConfigiOS} from './constants';
+import {NotificationConsumer} from '@walmart/core-services/Notification/consumers';
+import {initNotificationListeners, miniAppNotificationRef} from "./notification";
export const LOGGER_FIELDS = {id: 'texting-mini-app'};
@@ -61,6 +63,10 @@ export const TextingMiniApp = () => {
const storeId: string = useSelector(SiteSelectors.getUserWorkingSite) ?? '1';
const countryCode: string = useSelector(SiteSelectors.getSiteCountry) ?? 'us';
+ useEffect(() => {
+ initNotificationListeners();
+ }, []);
+
useMemo(() => {
purgeOldFiles();
}, []);
@@ -89,13 +95,15 @@ export const TextingMiniApp = () => {
return (
<LoggerCloneProvider fields={LOGGER_FIELDS}>
<HttpClientCloneProvider id={HTTP_CLIENT_KEY} config={clientConfig}>
- <PresenceProvider>
- <ChannelsProvider>
- <TextingReducerProvider value={{textingState, dispatch}}>
- <TextingNavigation />
- </TextingReducerProvider>
- </ChannelsProvider>
- </PresenceProvider>
+ <NotificationConsumer ref={miniAppNotificationRef}>
+ <PresenceProvider>
+ <ChannelsProvider>
+ <TextingReducerProvider value={{textingState, dispatch}}>
+ <TextingNavigation />
+ </TextingReducerProvider>
+ </ChannelsProvider>
+ </PresenceProvider>
+ </NotificationConsumer>
</HttpClientCloneProvider>
</LoggerCloneProvider>
);
--- src/notification.ts
@@ -0,0 +1,67 @@
+import {SumoPushEvent, SumoPushEventTypes} from 'react-native-wm-notification';
+import {
+ getDeferredNotificationContext,
+ INotificationContext,
+} from '@walmart/core-services/Notification';
+import {IAllsparkNotification} from '@walmart/core-services-allspark';
+import {createRef} from 'react';
+
+export const miniAppNotificationRef = createRef<
+ INotificationContext<IAllsparkNotification>
+>();
+
+export const onBackgroundNotification = (event?: SumoPushEvent) => {
+ let handled = false;
+
+ if (event?.customData?.category) {
+ console.log(
+ 'Texting mini app is handling this notification! The category: ' +
+ event?.customData?.category,
+ );
+ handled = true;
+ }
+
+ return handled;
+};
+
+export const initNotificationListeners = async () => {
+ const notification = (await getDeferredNotificationContext()) as IAllsparkNotification;
+
+ notification.addListener(
+ SumoPushEventTypes.ON_BACKGROUND_NOTIFICATION,
+ onBackgroundNotification,
+ );
+
+ notification.addListener(
+ SumoPushEventTypes.ON_FOREGROUND_NOTIFICATION,
+ onBackgroundNotification,
+ );
+
+ notification.addListener(
+ SumoPushEventTypes.ON_CONTENT_AVAILABLE_NOTIFICATION,
+ onBackgroundNotification,
+ );
+
+ notification.addListener(
+ SumoPushEventTypes.ON_TAPPED_NOTIFICATION_ACTION,
+ onBackgroundNotification,
+ );
+
+ const staticEvent: SumoPushEvent = {
+ sumoMessageId: 'fakeMessageId',
+ correlationId: 'fakeId',
+ title: 'A Static Test Notification',
+ body: 'Some Body For The Push',
+ sound: 'NotAvailable',
+ contentAvailable: 0,
+ mutableContent: 0,
+ customData: {
+ category: 'pushtotalkv2',
+ },
+ };
+
+ notification.runListeners(
+ SumoPushEventTypes.ON_BACKGROUND_NOTIFICATION,
+ staticEvent,
+ );
+};
--- src/index.tsx
@@ -1,4 +1,4 @@
-import React, {Dispatch, useMemo, useReducer} from 'react';
+import React, {Dispatch, useEffect, useMemo, useReducer} from 'react';
import {useSelector} from 'react-redux';
import {firebase} from '@react-native-firebase/app-check';
@@ -25,6 +25,8 @@ import {
import {PresenceProvider} from './presence';
import {ChannelsProvider} from './channels';
import {RNFBConfigAndroid, RNFBConfigiOS} from './constants';
+import {NotificationConsumer} from '@walmart/core-services/Notification/consumers';
+import {initNotificationListeners, miniAppNotificationRef} from "./notification";
export const LOGGER_FIELDS = {id: 'texting-mini-app'};
@@ -61,6 +63,10 @@ export const TextingMiniApp = () => {
const storeId: string = useSelector(SiteSelectors.getUserWorkingSite) ?? '1';
const countryCode: string = useSelector(SiteSelectors.getSiteCountry) ?? 'us';
+ useEffect(() => {
+ initNotificationListeners();
+ }, []);
+
useMemo(() => {
purgeOldFiles();
}, []);
@@ -89,13 +95,15 @@ export const TextingMiniApp = () => {
return (
<LoggerCloneProvider fields={LOGGER_FIELDS}>
<HttpClientCloneProvider id={HTTP_CLIENT_KEY} config={clientConfig}>
- <PresenceProvider>
- <ChannelsProvider>
- <TextingReducerProvider value={{textingState, dispatch}}>
- <TextingNavigation />
- </TextingReducerProvider>
- </ChannelsProvider>
- </PresenceProvider>
+ <NotificationConsumer ref={miniAppNotificationRef}>
+ <PresenceProvider>
+ <ChannelsProvider>
+ <TextingReducerProvider value={{textingState, dispatch}}>
+ <TextingNavigation />
+ </TextingReducerProvider>
+ </ChannelsProvider>
+ </PresenceProvider>
+ </NotificationConsumer>
</HttpClientCloneProvider>
</LoggerCloneProvider>
);
--- src/notification.ts
@@ -0,0 +1,67 @@
+import {SumoPushEvent, SumoPushEventTypes} from 'react-native-wm-notification';
+import {
+ getDeferredNotificationContext,
+ INotificationContext,
+} from '@walmart/core-services/Notification';
+import {IAllsparkNotification} from '@walmart/core-services-allspark';
+import {createRef} from 'react';
+
+export const miniAppNotificationRef = createRef<
+ INotificationContext<IAllsparkNotification>
+>();
+
+export const onBackgroundNotification = (event?: SumoPushEvent) => {
+ let handled = false;
+
+ if (event?.customData?.category) {
+ console.log(
+ 'Texting mini app is handling this notification! The category: ' +
+ event?.customData?.category,
+ );
+ handled = true;
+ }
+
+ return handled;
+};
+
+export const initNotificationListeners = async () => {
+ const notification = (await getDeferredNotificationContext()) as IAllsparkNotification;
+
+ notification.addListener(
+ SumoPushEventTypes.ON_BACKGROUND_NOTIFICATION,
+ onBackgroundNotification,
+ );
+
+ notification.addListener(
+ SumoPushEventTypes.ON_FOREGROUND_NOTIFICATION,
+ onBackgroundNotification,
+ );
+
+ notification.addListener(
+ SumoPushEventTypes.ON_CONTENT_AVAILABLE_NOTIFICATION,
+ onBackgroundNotification,
+ );
+
+ notification.addListener(
+ SumoPushEventTypes.ON_TAPPED_NOTIFICATION_ACTION,
+ onBackgroundNotification,
+ );
+
+ const staticEvent: SumoPushEvent = {
+ sumoMessageId: 'fakeMessageId',
+ correlationId: 'fakeId',
+ title: 'A Static Test Notification',
+ body: 'Some Body For The Push',
+ sound: 'NotAvailable',
+ contentAvailable: 0,
+ mutableContent: 0,
+ customData: {
+ category: 'pushtotalkv2',
+ },
+ };
+
+ notification.runListeners(
+ SumoPushEventTypes.ON_BACKGROUND_NOTIFICATION,
+ staticEvent,
+ );
+};
| firing sumo notification listener on app bootstrap | firing sumo notification listener on app bootstrap
|
f15d3eba03192d480c9ae69b1ef96220e9bed1b3 | --- src/hooks/messages.ts
@@ -3,7 +3,6 @@ import {useSelector} from 'react-redux';
import {useNavigation} from '@react-navigation/native';
import {SiteSelectors} from '@walmart/redux-store';
import {StackNavigationProp} from '@react-navigation/stack';
-import {encryptUserId} from '@walmart/allspark-utils';
import {
createAssociateChannelId,
@@ -13,6 +12,7 @@ import {
} from '../channels';
import {TextingNavParamsMap} from '../navigation';
import {getEncryptedUserId} from '../redux';
+import {encryptUserId} from '../utils';
export const useStartAssociateText = (replace: boolean = false) => {
const navigation = useNavigation<StackNavigationProp<TextingNavParamsMap>>();
@@ -25,7 +25,7 @@ export const useStartAssociateText = (replace: boolean = false) => {
async (recipientIds: string[]) => {
const participants = [
viewerId,
- ...recipientIds.map((id) => encryptUserId(id, site!)),
+ ...recipientIds.map((id) => encryptUserId(id)),
];
const storeDocumentId = createStoreDocumentId(site!);
const channelId = createAssociateChannelId(participants);
--- src/hooks/messages.ts
@@ -3,7 +3,6 @@ import {useSelector} from 'react-redux';
import {useNavigation} from '@react-navigation/native';
import {SiteSelectors} from '@walmart/redux-store';
import {StackNavigationProp} from '@react-navigation/stack';
-import {encryptUserId} from '@walmart/allspark-utils';
import {
createAssociateChannelId,
@@ -13,6 +12,7 @@ import {
} from '../channels';
import {TextingNavParamsMap} from '../navigation';
import {getEncryptedUserId} from '../redux';
+import {encryptUserId} from '../utils';
export const useStartAssociateText = (replace: boolean = false) => {
const navigation = useNavigation<StackNavigationProp<TextingNavParamsMap>>();
@@ -25,7 +25,7 @@ export const useStartAssociateText = (replace: boolean = false) => {
async (recipientIds: string[]) => {
const participants = [
viewerId,
- ...recipientIds.map((id) => encryptUserId(id, site!)),
+ ...recipientIds.map((id) => encryptUserId(id)),
];
const storeDocumentId = createStoreDocumentId(site!);
const channelId = createAssociateChannelId(participants);
| fix: fix user id encryption when starting new chat | fix: fix user id encryption when starting new chat
|
e1cd946bfb19bdba352d2fa6fa3aba10dd2744b0 | --- __mocks__/@walmart/me-at-walmart-common.js
@@ -23,5 +23,6 @@ module.exports = {
Layout: 'Layout',
addMultiple: jest.fn(),
remove: jest.fn(),
- }
+ },
+ useSidekickAssistantFABFocusEffect: jest.fn(),
};
--- __tests__/settings/thirdPartyNotices/ThirdyPartyNoticesTest.tsx
@@ -42,3 +42,11 @@ test('ThirdPartyNotices', async () => {
}),
).toEqual(true);
});
+
+test('should call useSidekickAssistantFABFocusEffect with visible: false', () => {
+ const {useSidekickAssistantFABFocusEffect} = require('@walmart/me-at-walmart-common');
+
+ render(<ThirdPartyNotices route={route} navigation={navigation} />);
+
+ expect(useSidekickAssistantFABFocusEffect).toHaveBeenCalledWith({visible: false});
+});
--- __tests__/termsOfUse/TermsOfUseTest.tsx
@@ -4,7 +4,7 @@ import {
TermsOfUse,
renderTermsSectionHeader,
} from '../../src/termsOfUse/TermsOfUse';
-import {TERMS_OF_USE_DATA} from '../../src/termsOfUse/terms-of-use.ts';
+import {TERMS_OF_USE_DATA} from '../../src/termsOfUse/terms-of-use';
test('TermsOfUseView', async () => {
render(<TermsOfUse />);
@@ -12,6 +12,14 @@ test('TermsOfUseView', async () => {
expect(TERMS_OF_USE_DATA.length).toEqual(20);
});
+test('should call useSidekickAssistantFABFocusEffect with visible: false', () => {
+ const {useSidekickAssistantFABFocusEffect} = require('@walmart/me-at-walmart-common');
+
+ render(<TermsOfUse />);
+
+ expect(useSidekickAssistantFABFocusEffect).toHaveBeenCalledWith({visible: false});
+});
+
describe('renderTermsSectionHeader', () => {
it('renders title with a number', () => {
const info = {
--- src/settings/thirdPartyNotices/ThirdPartyNotices.tsx
@@ -10,6 +10,7 @@ import {useAllsparkTranslation} from '@walmart/allspark-foundation/Translation';
import {Logger} from '../../core/Logger';
import {commonStyles} from '../styles';
import {THIRD_PARTY_NOTICES_HTML} from './third-party-notices';
+import {useSidekickAssistantFABFocusEffect} from '@walmart/me-at-walmart-common';
const WEB_VIEW_SOURCE = {html: THIRD_PARTY_NOTICES_HTML};
@@ -31,6 +32,8 @@ export const ThirdPartyNotices = (
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
+ useSidekickAssistantFABFocusEffect({visible: false});
+
const onLoadStart = () => setShowLoading(true);
const onLoadEnd = () => {
--- src/termsOfUse/TermsOfUse.tsx
@@ -18,6 +18,7 @@ import {
TermsOfUseType,
TermsOfUseSection,
} from './terms-of-use';
+import {useSidekickAssistantFABFocusEffect} from '@walmart/me-at-walmart-common';
const TermsOfUseListItem = (props: {item: string}) => {
const {item} = props;
@@ -76,6 +77,8 @@ export const TermsOfUse = () => {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
+ useSidekickAssistantFABFocusEffect({visible: false});
+
return (
<SafeAreaView style={styles.container} edges={['top']}>
<SectionList
| feat(fab): ALLSPARK-7372 Hide FAB on some settings screen (#5101) | feat(fab): ALLSPARK-7372 Hide FAB on some settings screen (#5101)
|
388b92522c37504c86b818bb2abeca243adeef3f | --- targets/US/ios/Podfile.lock
@@ -2126,9 +2126,9 @@ PODS:
- React-perflogger (= 0.73.7)
- ReactNativeART (1.2.0):
- React
- - Realm (20.0.0):
- - Realm/Headers (= 20.0.0)
- - Realm/Headers (20.0.0)
+ - Realm (10.51.0):
+ - Realm/Headers (= 10.51.0)
+ - Realm/Headers (10.51.0)
- RealmJS (12.8.1):
- React
- RNCallKeep (4.3.13):
@@ -2883,7 +2883,7 @@ SPEC CHECKSUMS:
React-utils: d07d009101c7dabff68b710da5c4a47b7a850d98
ReactCommon: 8cae78d3c3eceff20ee4bbca8bb73b675a45fd5d
ReactNativeART: 78edc68dd4a1e675338cd0cd113319cf3a65f2ab
- Realm: a799b5f9145623fb0bfe149fe81422863631dd0f
+ Realm: 7e75a684c16aca7c6a5db9c70caebf37f07dcee5
RealmJS: 2c7fdb3991d7655fba5f88eb288f75eaf5cb9980
RNCallKeep: 2015ba5eb74666407e3613fd54c65bd227624a0a
RNCAsyncStorage: ec53e44dc3e75b44aa2a9f37618a49c3bc080a7a
| rollback realm to 10.51.0 | rollback realm to 10.51.0
|
93b00b124cb3fbfd4ff4bf097466de2e42ee5b99 | --- package-lock.json
@@ -4405,18 +4405,41 @@
"integrity": "sha512-2ykymwKYPNCHKRoSbwBpvNXMgjqkdKOi5O0DMvgilWp5R61li+Afn4j9aTASc05bwTSQX5R/kI3xP8+dIED6FA=="
},
"@walmart/schedule-mini-app": {
- "version": "0.12.0",
- "resolved": "https://npme.walmart.com/@walmart/schedule-mini-app/-/schedule-mini-app-0.12.0.tgz",
- "integrity": "sha512-q0vy2KAFCtVAlQ6F/qXseVYqlkaUgkptHTEnYhQwK6MRe9iCBjMcnfD/2yLKNQHZJCn1839BXPP+m8cFOyJyrA==",
+ "version": "0.13.0",
+ "resolved": "https://npme.walmart.com/@walmart/schedule-mini-app/-/schedule-mini-app-0.13.0.tgz",
+ "integrity": "sha512-+jm0akPlgBHkpvYII2MH0AqmaR/hXsWxws6xQjh73jaKjPuFViYhLGDTXRdN30+svmQ/nVpRv8XFOWeEUn4/ng==",
"requires": {
"@walmart/moment-walmart": "^1.0.4",
- "@walmart/wfm-ui": "0.2.11",
+ "@walmart/wfm-ui": "0.2.14",
"crypto-js": "^3.3.0",
"react-native-tab-view": "^2.4.0",
"reselect": "^4.0.0",
"wfm-allspark-data-library": "0.2.1"
},
"dependencies": {
+ "@walmart/wfm-ui": {
+ "version": "0.2.11",
+ "resolved": "https://npme.walmart.com/@walmart/wfm-ui/-/wfm-ui-0.2.11.tgz",
+ "integrity": "sha512-NIsEkS1LnNwYmwUAOWSsViqRfS99jR1xTy0ViZm3OCeFDONcDYaSF/jTpfvaQDYM0kXG3aehJk1MGEeW43bJmg==",
+ "requires": {
+ "@walmart/moment-walmart": "1.0.3",
+ "lodash": "^4.17.20",
+ "lodash.get": "^4.4.2",
+ "lodash.isequal": "^4.5.0",
+ "lodash.uniqby": "^4.7.0",
+ "react-native-material-menu": "^0.4.2",
+ "react-native-vector-icons": "^7.0.0",
+ "string.prototype.matchall": "^4.0.2",
+ "wm-react-native-vector-icons": "^1.0.26"
+ },
+ "dependencies": {
+ "@walmart/moment-walmart": {
+ "version": "1.0.3",
+ "resolved": "https://npme.walmart.com/@walmart/moment-walmart/-/moment-walmart-1.0.3.tgz",
+ "integrity": "sha1-JYhQmoi+ylQ/z6jdXhGZncmaYGQ="
+ }
+ }
+ },
"react-native-tab-view": {
"version": "2.16.0",
"resolved": "https://npme.walmart.com/react-native-tab-view/-/react-native-tab-view-2.16.0.tgz",
@@ -4543,9 +4566,9 @@
"integrity": "sha512-AvGogrjaqFMpTdWMl5oBpS9Phm6+dOUHu8FVvmOkBnzLiRwAysmeQIPkrtEu5haqIgMR4UhSh7XcDLLi/XvBAA=="
},
"@walmart/wfm-ui": {
- "version": "0.2.11",
- "resolved": "https://npme.walmart.com/@walmart/wfm-ui/-/wfm-ui-0.2.11.tgz",
- "integrity": "sha512-NIsEkS1LnNwYmwUAOWSsViqRfS99jR1xTy0ViZm3OCeFDONcDYaSF/jTpfvaQDYM0kXG3aehJk1MGEeW43bJmg==",
+ "version": "0.2.14",
+ "resolved": "https://npme.walmart.com/@walmart/wfm-ui/-/wfm-ui-0.2.14.tgz",
+ "integrity": "sha512-G1Nv0A4Y3OXSSs3fHkg/gJOBAmPHpdJvhVOQrk8Fug9ObcBkMWZTdpKrY6KDLgGjVa306UFnbS+iPf+plBwqpA==",
"requires": {
"@walmart/moment-walmart": "1.0.3",
"lodash": "^4.17.20",
@@ -6809,9 +6832,9 @@
}
},
"es-abstract": {
- "version": "1.19.2",
- "resolved": "https://npme.walmart.com/es-abstract/-/es-abstract-1.19.2.tgz",
- "integrity": "sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==",
+ "version": "1.19.5",
+ "resolved": "https://npme.walmart.com/es-abstract/-/es-abstract-1.19.5.tgz",
+ "integrity": "sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==",
"requires": {
"call-bind": "^1.0.2",
"es-to-primitive": "^1.2.1",
@@ -6824,7 +6847,7 @@
"is-callable": "^1.2.4",
"is-negative-zero": "^2.0.2",
"is-regex": "^1.1.4",
- "is-shared-array-buffer": "^1.0.1",
+ "is-shared-array-buffer": "^1.0.2",
"is-string": "^1.0.7",
"is-weakref": "^1.0.2",
"object-inspect": "^1.12.0",
@@ -6859,6 +6882,14 @@
"has-tostringtag": "^1.0.0"
}
},
+ "is-shared-array-buffer": {
+ "version": "1.0.2",
+ "resolved": "https://npme.walmart.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+ "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+ "requires": {
+ "call-bind": "^1.0.2"
+ }
+ },
"object-inspect": {
"version": "1.12.0",
"resolved": "https://npme.walmart.com/object-inspect/-/object-inspect-1.12.0.tgz",
@@ -8098,6 +8129,11 @@
"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
"dev": true
},
+ "functions-have-names": {
+ "version": "1.2.3",
+ "resolved": "https://npme.walmart.com/functions-have-names/-/functions-have-names-1.2.3.tgz",
+ "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
+ },
"gauge": {
"version": "2.7.4",
"resolved": "https://npme.walmart.com/gauge/-/gauge-2.7.4.tgz",
@@ -9029,7 +9065,8 @@
"is-shared-array-buffer": {
"version": "1.0.1",
"resolved": "https://npme.walmart.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
- "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA=="
+ "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
+ "dev": true
},
"is-stream": {
"version": "1.1.0",
@@ -17677,12 +17714,13 @@
}
},
"regexp.prototype.flags": {
- "version": "1.4.1",
- "resolved": "https://npme.walmart.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz",
- "integrity": "sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==",
+ "version": "1.4.3",
+ "resolved": "https://npme.walmart.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+ "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
"requires": {
"call-bind": "^1.0.2",
- "define-properties": "^1.1.3"
+ "define-properties": "^1.1.3",
+ "functions-have-names": "^1.2.2"
}
},
"regexpp": {
--- package.json
@@ -98,14 +98,14 @@
"@walmart/react-native-sumo-sdk": "2.1.0",
"@walmart/redux-store": "1.1.26",
"@walmart/refrigeration-alarms-mini-app": "1.34.0",
- "@walmart/schedule-mini-app": "0.12.0",
+ "@walmart/schedule-mini-app": "0.13.0",
"@walmart/settings-mini-app": "1.6.0",
"@walmart/shelfavailability-mini-app": "0.8.3",
"@walmart/taskit-mini-app": "0.255.0-rc.1",
"@walmart/time-clock-mini-app": "0.4.33",
"@walmart/ui-components": "1.3.0-rc.14",
"@walmart/welcomeme-mini-app": "0.47.0",
- "@walmart/wfm-ui": "0.2.11",
+ "@walmart/wfm-ui": "0.2.14",
"axios-cache-adapter": "2.7.3",
"crypto-js": "^3.3.0",
"dayjs": "^1.10.5",
| bump schedule-mini-app & wfm-ui dependency vers | bump schedule-mini-app & wfm-ui dependency vers
|
03c51bbaebb7c0875494667c54ce95cad0afbc49 | --- .looper-pr.yml
@@ -23,7 +23,7 @@ envs:
LINT: true
UNITTEST: false
BUILD: true
- SONAR_SCAN: false
+ SONAR_SCAN: true
ARTIFACT_PUBLISH: true
AUTO_PR_MONO: false
JIRAPREFIX: SSMP
| fix(ui): update roster and wmconnect mini app version smdv-9999 | fix(ui): update roster and wmconnect mini app version smdv-9999
|
6d8266c98b18c4cffda5dda70ebe2bf64e9a3082 | --- graphql.yml
@@ -1,6 +1,9 @@
schemaVersion: "1.0.0"
enableGating: true
teamRostersProductId: 1824
+notify:
+ slack:
+ channelName: "smdv-miniapp"
applications:
- name: "WMCONNECT-MINIAPP"
applicationKey: "WMCONNECT-MINIAPP"
| feat(ui): update graphql yml | feat(ui): update graphql yml
|
fd46630eba2369a38cee17f7e5f6745703b36197 | --- __tests__/scripts/package-deprecation-check/helperTest.ts
@@ -171,6 +171,20 @@ describe('helper.ts', () => {
foundInFile: 'src/test.ts'
};
+ const mockWMLibrary = {
+ legacyLibrary: '@walmart/old-lib@^1.0.0',
+ replacement: '@walmart/new-lib',
+ enforcementDate: '2024-01-01',
+ notes: 'This library is deprecated'
+ };
+
+ const mockWMFinding = {
+ library: mockWMLibrary,
+ source: 'test-source',
+ packageVersion: '1.2.3',
+ foundInFile: 'src/test.ts'
+ };
+
it('should return empty comment for empty findings', () => {
const result = helper.getPRComment([], true);
expect(result.prComment).toBe('');
@@ -188,6 +202,18 @@ describe('helper.ts', () => {
expect(result.prComment).toContain('**Note:** This library is deprecated');
});
+ it('should generate comment for deprecated WM libraries', () => {
+ const findings = [mockWMFinding];
+ const result = helper.getPRComment(findings, true);
+
+ expect(result.prComment).toContain('❌ **DEPRECATED libraries found');
+ expect(result.prComment).toContain('**test-source:**');
+ expect(result.prComment).toContain('`@walmart/old-lib@1.2.3`');
+ expect(result.prComment).toContain('(via src/test.ts)');
+ expect(result.prComment).toContain('**Use:** `@walmart/new-lib`');
+ expect(result.prComment).toContain('**Note:** This library is deprecated');
+ });
+
it('should generate comment for scheduled deprecation libraries', () => {
const findings = [mockFinding];
const result = helper.getPRComment(findings, false);
--- scripts/mini-app-scan/package-deprecation/helper.ts
@@ -127,6 +127,12 @@ function cleanLibraryName(libraryString: string): string {
return libraryString.split('#')[0];
}
if (libraryString.includes('@')) {
+ const splitLibraryArr = libraryString.split('@');
+ // @walmart case, ex: @walmart/lib@1.0.0 or @walmart/lib
+ if (splitLibraryArr[1].includes('walmart')) {
+ return `@${splitLibraryArr[1]}`;
+ }
+ // 3rd party library case, ex: react@17.0.0
return libraryString.split('@')[0];
}
return libraryString;
| fix: fix issue where @walmart libraries are not shown in the PR comments (#4662) | fix: fix issue where @walmart libraries are not shown in the PR comments (#4662)
Co-authored-by: Dylan Lane - rlane1 <Russell.Lane@walmart.com> |
497e2396166b5f756b1abb3c17213848c938b868 | --- packages/allspark-foundation-hub/__tests__/HubFeature/Hub/Container/__snapshots__/HubDashboard.test.tsx.snap
@@ -5,7 +5,7 @@ exports[`HubDashboard renders FloatingButton Component 1`] = `
<RCTScrollView
contentContainerStyle={
{
- "paddingBottom": 48,
+ "paddingBottom": 0,
}
}
onScroll={[Function]}
| Add bottom padding for the container | Add bottom padding for the container
|
56b7347f0f3c5b0648e077c75399a295c61c101b | --- package.json
@@ -141,7 +141,7 @@
"@walmart/react-native-webex-sdk": "patch:@walmart/react-native-webex-sdk@npm%3A0.8.40#~/.yarn/patches/@walmart-react-native-webex-sdk-npm-0.8.40-d3d8ef2340.patch",
"@walmart/receipt-check-miniapp": "1.30.2",
"@walmart/redux-store": "~6.3.28",
- "@walmart/returns-mini-app": "4.16.8",
+ "@walmart/returns-mini-app": "4.17.0",
"@walmart/rfid-scan-mini-app": "2.10.4",
"@walmart/rn-mobile-sdk-pairing": "2.1.8",
"@walmart/rn-receiving-mini-app": "2.4.86",
--- yarn.lock
@@ -8740,7 +8740,7 @@ __metadata:
"@walmart/react-native-webex-sdk": "patch:@walmart/react-native-webex-sdk@npm%3A0.8.40#~/.yarn/patches/@walmart-react-native-webex-sdk-npm-0.8.40-d3d8ef2340.patch"
"@walmart/receipt-check-miniapp": "npm:1.30.2"
"@walmart/redux-store": "npm:~6.3.28"
- "@walmart/returns-mini-app": "npm:4.16.8"
+ "@walmart/returns-mini-app": "npm:4.17.0"
"@walmart/rfid-scan-mini-app": "npm:2.10.4"
"@walmart/rn-mobile-sdk-pairing": "npm:2.1.8"
"@walmart/rn-receiving-mini-app": "npm:2.4.86"
@@ -9319,9 +9319,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/returns-mini-app@npm:4.16.8":
- version: 4.16.8
- resolution: "@walmart/returns-mini-app@npm:4.16.8::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freturns-mini-app%2F-%2F%40walmart%2Freturns-mini-app-4.16.8.tgz"
+"@walmart/returns-mini-app@npm:4.17.0":
+ version: 4.17.0
+ resolution: "@walmart/returns-mini-app@npm:4.17.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freturns-mini-app%2F-%2F%40walmart%2Freturns-mini-app-4.17.0.tgz"
dependencies:
"@walmart/common-utilities-js": "npm:^1.2.10"
"@walmart/virtual-zpl-printer-model": "npm:^0.2.11"
@@ -9347,7 +9347,7 @@ __metadata:
dependenciesMeta:
"@walmart/me-at-walmart":
built: false
- checksum: 10c0/776ee5fea8d1fb621bd5764b66bc9be0351def92b3701571d800891b572e795de7e768cf896c8e332f8bbdb68f5b5c560e21daee4deb70bf2abd577ca87e71cc
+ checksum: 10c0/3fdec1926800f49c06355bdf34fc5271c0473513a3606aae4a550e52affc393f2a5f7267cfb2779f2965d467388ed416d19a39e610a1dc78a81b3f11a928bf23
languageName: node
linkType: hard
| chore(ui): drop 31 returns mini app changes (#4339) | chore(ui): drop 31 returns mini app changes (#4339)
Co-authored-by: Maksym Novakh - m0n09mr <Maksym.Novakh0@walmart.com>
Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com> |
ee728a87db195fbfb1297f632e826ed169cb5e53 | --- container/index.tsx
@@ -17,6 +17,7 @@ import {UserView} from './UserInfo';
import env from './env';
import {TextingMiniApp, initialize} from '../src';
+import {TextingNavigation} from "../src/navigation";
const styles = StyleSheet.create({
container: {
--- src/index.tsx
@@ -24,16 +24,8 @@ import {
import {PresenceProvider} from './presence';
import {ChannelsProvider} from './channels';
import {RNFBConfigAndroid, RNFBConfigiOS} from './constants';
-import {NotificationConsumer} from '@walmart/core-services/Notification/consumers';
-import {
- initNotificationListeners,
- miniAppNotificationRef,
-} from './notification';
+import {initNotificationListeners} from './notification';
import {routePushNotificationSaga} from './redux/Notifications/sagas';
-import WmNotification, {
- SumoPushEvent,
- SumoPushEventTypes,
-} from 'react-native-wm-notification';
export const LOGGER_FIELDS = {id: 'texting-mini-app'};
@@ -100,15 +92,13 @@ export const TextingMiniApp = () => {
return (
<LoggerCloneProvider fields={LOGGER_FIELDS}>
<HttpClientCloneProvider id={HTTP_CLIENT_KEY} config={clientConfig}>
- <NotificationConsumer ref={miniAppNotificationRef}>
- <PresenceProvider>
- <ChannelsProvider>
- <TextingReducerProvider value={{textingState, dispatch}}>
- <TextingNavigation />
- </TextingReducerProvider>
- </ChannelsProvider>
- </PresenceProvider>
- </NotificationConsumer>
+ <PresenceProvider>
+ <ChannelsProvider>
+ <TextingReducerProvider value={{textingState, dispatch}}>
+ <TextingNavigation />
+ </TextingReducerProvider>
+ </ChannelsProvider>
+ </PresenceProvider>
</HttpClientCloneProvider>
</LoggerCloneProvider>
);
--- src/notification.ts
@@ -2,18 +2,17 @@ import WmNotification, {
SumoPushEvent,
SumoPushEventTypes,
} from 'react-native-wm-notification';
-import {NotificationActions} from "./redux/Notifications";
-import {getStore} from '@walmart/redux-store';
+import {navigate} from '@walmart/react-native-shared-navigation';
export const onBackgroundNotification = (event?: SumoPushEvent) => {
let handled = false;
- const dispatch = getStore()?.dispatch;
if (event?.customData?.category) {
console.log(
'***** Texting mini app is handling this notification! The category: ' +
event?.customData?.category,
);
- dispatch(NotificationActions.routePushNotification(event?.customData));
+ // @ts-ignore
+ navigate('texting', {screen: 'texting.newMessage'});
handled = true;
}
@@ -55,7 +54,7 @@ export const initNotificationListeners = async () => {
};
WmNotification.runListeners(
- SumoPushEventTypes.ON_BACKGROUND_NOTIFICATION,
- staticEvent,
+ SumoPushEventTypes.ON_BACKGROUND_NOTIFICATION,
+ staticEvent,
);
};
--- container/index.tsx
@@ -17,6 +17,7 @@ import {UserView} from './UserInfo';
import env from './env';
import {TextingMiniApp, initialize} from '../src';
+import {TextingNavigation} from "../src/navigation";
const styles = StyleSheet.create({
container: {
--- src/index.tsx
@@ -24,16 +24,8 @@ import {
import {PresenceProvider} from './presence';
import {ChannelsProvider} from './channels';
import {RNFBConfigAndroid, RNFBConfigiOS} from './constants';
-import {NotificationConsumer} from '@walmart/core-services/Notification/consumers';
-import {
- initNotificationListeners,
- miniAppNotificationRef,
-} from './notification';
+import {initNotificationListeners} from './notification';
import {routePushNotificationSaga} from './redux/Notifications/sagas';
-import WmNotification, {
- SumoPushEvent,
- SumoPushEventTypes,
-} from 'react-native-wm-notification';
export const LOGGER_FIELDS = {id: 'texting-mini-app'};
@@ -100,15 +92,13 @@ export const TextingMiniApp = () => {
return (
<LoggerCloneProvider fields={LOGGER_FIELDS}>
<HttpClientCloneProvider id={HTTP_CLIENT_KEY} config={clientConfig}>
- <NotificationConsumer ref={miniAppNotificationRef}>
- <PresenceProvider>
- <ChannelsProvider>
- <TextingReducerProvider value={{textingState, dispatch}}>
- <TextingNavigation />
- </TextingReducerProvider>
- </ChannelsProvider>
- </PresenceProvider>
- </NotificationConsumer>
+ <PresenceProvider>
+ <ChannelsProvider>
+ <TextingReducerProvider value={{textingState, dispatch}}>
+ <TextingNavigation />
+ </TextingReducerProvider>
+ </ChannelsProvider>
+ </PresenceProvider>
</HttpClientCloneProvider>
</LoggerCloneProvider>
);
--- src/notification.ts
@@ -2,18 +2,17 @@ import WmNotification, {
SumoPushEvent,
SumoPushEventTypes,
} from 'react-native-wm-notification';
-import {NotificationActions} from "./redux/Notifications";
-import {getStore} from '@walmart/redux-store';
+import {navigate} from '@walmart/react-native-shared-navigation';
export const onBackgroundNotification = (event?: SumoPushEvent) => {
let handled = false;
- const dispatch = getStore()?.dispatch;
if (event?.customData?.category) {
console.log(
'***** Texting mini app is handling this notification! The category: ' +
event?.customData?.category,
);
- dispatch(NotificationActions.routePushNotification(event?.customData));
+ // @ts-ignore
+ navigate('texting', {screen: 'texting.newMessage'});
handled = true;
}
@@ -55,7 +54,7 @@ export const initNotificationListeners = async () => {
};
WmNotification.runListeners(
- SumoPushEventTypes.ON_BACKGROUND_NOTIFICATION,
- staticEvent,
+ SumoPushEventTypes.ON_BACKGROUND_NOTIFICATION,
+ staticEvent,
);
};
| navigating to search screen when app bootstrap simulating a push event | navigating to search screen when app bootstrap simulating a push event
|
25f544f5c3e3754e785d037395062402c8db69c2 | --- android/app/src/main/assets/fonts/icomoon.ttf
Binary files a/android/app/src/main/assets/fonts/icomoon.ttf and b/android/app/src/main/assets/fonts/icomoon.ttf differ
--- ios/icomoon.ttf
Binary files a/ios/icomoon.ttf and b/ios/icomoon.ttf differ
| Adding shelf-availability icon | Adding shelf-availability icon
|
d2117e15b5cea35d5b17ba3b3a84b3f008f73ad5 | --- src/auth/ErrorScreen.tsx
@@ -22,6 +22,8 @@ import {
ExclamationCircleFillIcon,
ThemeProvider,
colors,
+ Icons,
+ Nudge,
} from '@walmart/gtp-shared-components';
import {useLogger} from '@walmart/core-services/Logger';
import {useTelemetry} from '@walmart/core-services/Telemetry';
@@ -243,6 +245,11 @@ export const ErrorScreen = (
<Subheader style={styles.errorMsg} testID='errorMessage'>
{translate('ssoError.errorMsg')}
</Subheader>
+ <Nudge
+ title={translate('ssoError.immediateSupport')}
+ leading={<Icons.PhoneIcon size={24} />}>
+ {translate('ssoError.supportDesc')}
+ </Nudge>
<Subheader2 style={styles.errorTitle}>
{translate('ssoError.reportIssueTitle')}
--- src/auth/styles.ts
@@ -119,6 +119,7 @@ export default StyleSheet.create({
color: colors.gray['160'],
},
errorTitle: {
+ marginTop: 16,
fontSize: 16,
lineHeight: 24,
},
--- src/translations/en-US.ts
@@ -179,6 +179,7 @@ export const enUS_common = {
enterUserId: 'Enter User ID',
errorMsg:
'Sorry – something went wrong. Please share your User ID, Site ID to help our team resolve the issue.',
+ immediateSupport: 'Need Immediate support?',
issueCategory: 'Sign-in issue category',
location: 'Location',
networkErrorDescription:
@@ -193,6 +194,8 @@ export const enUS_common = {
selectIssue: 'Make a selection',
send: 'Send',
siteId: 'Site ID',
+ supportDesc:
+ 'If you work in a store call 1-700-WALMART (1-700-925-6278)\n\nIf you work at a supply chain site call 479-621-2228',
timeMismatchErrorDescription:
'To sign in, your device’s time must match the time and time zone where you’re working.',
timeMismatchErrorTitle: 'Adjust device clock',
--- src/translations/es-MX.ts
@@ -186,6 +186,7 @@ export const esMX_common = {
enterUserId: 'Introduce ID de Usuario',
errorMsg:
'Lo sentimos - algo salió mal. Por favor, comparte tu ID de usuario para ayudar a nuestro equipo a solucionar el problema.',
+ immediateSupport: '¿Necesita soporte inmediato?',
issueCategory: 'Categoría de problema de inicio de sesión',
location: 'Location',
networkErrorDescription:
@@ -200,6 +201,8 @@ export const esMX_common = {
selectIssue: 'Haz una selección',
send: 'Enviar',
siteId: 'ID de Sitio',
+ supportDesc:
+ 'Si trabaja en una tienda llame al 1-700-WALMART (1-700-925-6278)\n\nSi trabaja en un sitio de la cadena de suministro, llame al 479-621-2228',
timeMismatchErrorDescription:
'To sign in, your device’s time must match the time and time zone where you’re working.',
timeMismatchErrorTitle: 'Adjust device clock',
| added support desc card on error screen. | added support desc card on error screen.
|
ab243ecfb5a808e8fb571a770c38eb584d188db9 | --- package-lock.json
@@ -53,7 +53,7 @@
"@walmart/gtp-shared-components": "2.0.4",
"@walmart/impersonation-mini-app": "1.17.2",
"@walmart/ims-print-services-ui": "2.0.6",
- "@walmart/inbox-mini-app": "0.82.2",
+ "@walmart/inbox-mini-app": "0.82.3",
"@walmart/iteminfo-mini-app": "7.0.8",
"@walmart/manager-approvals-miniapp": "0.2.1",
"@walmart/me-field-mini-app": "1.1.45",
@@ -5322,9 +5322,9 @@
}
},
"node_modules/@walmart/inbox-mini-app": {
- "version": "0.82.2",
- "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.82.2.tgz",
- "integrity": "sha512-lMfCywNHdLtpGyB/Q9jFJNzXQZUbVmsmShKhdivQndueKt+tlr//LTmjAXITPgiEAS+p2KDIe3hfjNjjCQzlHA==",
+ "version": "0.82.3",
+ "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.82.3.tgz",
+ "integrity": "sha512-P+KqxXVInAWM3Bh25QvLVbVuwzzb5aLpuWLj92aiDhEVsvFMemJSKdWvy3o8LhRV7zaYuVI6f8ZUrTuBvKWr9w==",
"dependencies": {
"@walmart/moment-walmart": "^1.0.4",
"@walmart/walmart-fiscal-week": "^0.3.6"
@@ -25146,9 +25146,9 @@
"version": "2.0.6"
},
"@walmart/inbox-mini-app": {
- "version": "0.82.2",
- "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.82.2.tgz",
- "integrity": "sha512-lMfCywNHdLtpGyB/Q9jFJNzXQZUbVmsmShKhdivQndueKt+tlr//LTmjAXITPgiEAS+p2KDIe3hfjNjjCQzlHA==",
+ "version": "0.82.3",
+ "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.82.3.tgz",
+ "integrity": "sha512-P+KqxXVInAWM3Bh25QvLVbVuwzzb5aLpuWLj92aiDhEVsvFMemJSKdWvy3o8LhRV7zaYuVI6f8ZUrTuBvKWr9w==",
"requires": {
"@walmart/moment-walmart": "1.0.4",
"@walmart/walmart-fiscal-week": "^0.3.6"
--- package.json
@@ -95,7 +95,7 @@
"@walmart/gtp-shared-components": "2.0.4",
"@walmart/impersonation-mini-app": "1.17.2",
"@walmart/ims-print-services-ui": "2.0.6",
- "@walmart/inbox-mini-app": "0.82.2",
+ "@walmart/inbox-mini-app": "0.82.3",
"@walmart/iteminfo-mini-app": "7.0.8",
"@walmart/manager-approvals-miniapp": "0.2.1",
"@walmart/me-field-mini-app": "1.1.45",
| bug fix inbox | bug fix inbox
|
c8436adec35e611515b8f0881938ae43c48e780e | --- src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-shadow */
import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
import {translationClient} from '../../common/translation';
import {RefreshControl, View} from 'react-native';
| Update src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen.tsx | Update src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen.tsx
Co-authored-by: AI Code Assistant <AI-Code-Assistant@email.wal-mart.com> |
7b907aa3f8e2d8b58f0e46ac19127b14337200af | --- package-lock.json
@@ -4225,9 +4225,9 @@
}
},
"@walmart/allspark-home-mini-app": {
- "version": "0.5.30",
- "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.5.30.tgz",
- "integrity": "sha512-SJSJ+GG5yUVMZKgugHITQhgKfNP52RLEDE0P9UrNHUNxv/lTk4h96/d/yEbVgQVd2SU2ftDumdzfI1qy9COO+w==",
+ "version": "0.5.33",
+ "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.5.33.tgz",
+ "integrity": "sha512-aMEfWDoXxnwCoGoyKxmuuGyQgq38hpFFXxeg7iPXbr/sw0lOHby3BzhMEVQkVF3/O6IH8Cu/IB+xB/dVcqHeCg==",
"requires": {
"moment": "^2.29.0",
"uuid": "^8.3.1"
--- package.json
@@ -71,7 +71,7 @@
"@sharcoux/slider": "^5.2.1",
"@terrylinla/react-native-sketch-canvas": "^0.8.0",
"@walmart/allspark-health-survey-mini-app": "0.0.44",
- "@walmart/allspark-home-mini-app": "0.5.30",
+ "@walmart/allspark-home-mini-app": "0.5.33",
"@walmart/allspark-neon-core": "0.1.26",
"@walmart/ask-sam-mini-app": "0.41.7",
"@walmart/config-components": "3.0.2",
@@ -90,7 +90,7 @@
"@walmart/moment-walmart": "1.0.4",
"@walmart/payrollsolution_miniapp": "0.121.0",
"@walmart/price-changes-mini-app": "1.2.3",
- "@walmart/profile-feature-app": "0.0.23",
+ "@walmart/profile-feature-app": "0.0.30",
"@walmart/push-to-talk-mini-app": "1.7.10",
"@walmart/react-native-env": "^0.2.0",
"@walmart/react-native-logger": "^1.29.0",
--- src/navigation/AssociateHallwayNav/Tabs/MeStackNav.tsx
@@ -10,6 +10,7 @@ import {
} from '@walmart/profile-feature-app';
import {DrawerButton, Header} from '@walmart/ui-components';
import {PaymentSelectionMiniApp} from '@walmart/payrollsolution_miniapp';
+import {TimeClockTabs} from '@walmart/time-clock-mini-app';
const MeStack = createStackNavigator();
@@ -52,6 +53,7 @@ export const MeStackNav = () => {
component={PaymentSelectionMiniApp}
options={{headerShown: false}}
/>
+ <MeStack.Screen name='timeClockTabs' component={TimeClockTabs} />
</MeStack.Navigator>
);
};
| updated home to latest and added TimeClockTabs screen to Me Stack | updated home to latest and added TimeClockTabs screen to Me Stack
|
d4683b6e3a39344740efc72bd53cedf5a21a92ba | --- ios/Podfile.lock
@@ -538,7 +538,7 @@ PODS:
- RCTTypeSafety
- React
- ReactCommon/turbomodule/core
- - react-native-scanner-3.0 (0.2.1):
+ - react-native-scanner-3.0 (0.2.2):
- Firebase/Analytics
- React
- ScanditBarcodeCapture (= 6.14.0)
@@ -1220,7 +1220,7 @@ SPEC CHECKSUMS:
react-native-ptt-module: 47e1b73551afa3830155cc92f4809d06c38e5eca
react-native-render-html: 984dfe2294163d04bf5fe25d7c9f122e60e05ebe
react-native-safe-area-context: 6c12e3859b6f27b25de4fee8201cfb858432d8de
- react-native-scanner-3.0: 357a5d88bc757579087ef0d2ce2001b17b6e323b
+ react-native-scanner-3.0: 81557c1b199e5a905dd44600b32effb9004fdeb9
react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253
react-native-view-shot: 792829857bbb23a9c8acdad9a640554bdee397a3
| build(pod): update scanner pod to 0.2.2 | build(pod): update scanner pod to 0.2.2
|
a580974e8418050409d89d022eefdf32fa775772 | --- packages/allspark-foundation-hub/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/allspark-foundation-hub",
- "version": "1.2.7-alpha.2",
+ "version": "1.2.7-alpha.3",
"description": "",
"main": "lib/index.js",
"types": "lib/index.d.ts",
--- packages/allspark-foundation-hub/src/SupplyChain/Utils/utils.ts
@@ -1,7 +1,3 @@
-export const ASC_SORT = -1;
-export const DESC_SORT = 1;
-export const NO_SORT = 0;
-
/**
*
* @param objA
@@ -10,6 +6,8 @@ export const NO_SORT = 0;
* @returns
*/
+import { ASC_SORT, DESC_SORT, NO_SORT } from '../../Shared';
+
export const customSorter = <T>(objA: T, objB: T, key: keyof T): number => {
if (objA[key] && objB[key]) {
if (objA[key] > objB[key]) {
--- packages/allspark-foundation-hub/src/index.ts
@@ -1,3 +1,4 @@
export * from './AllsparkHubContainer';
export * from './Store';
export * from './SupplyChain';
+export * from './Shared';
| Update the allspark foundation hub version for SC | Update the allspark foundation hub version for SC
|
906412e80e451e3e771571f8d29babe851933fef | --- package-lock.json
@@ -4263,9 +4263,9 @@
"integrity": "sha512-Kcf+R1iCgxHOLCwMoW+zrde/AgO41H65qWBwGxBnKfHzy0JRJcdpZBldAksoK6j2RlT6IvCZoju3WydXMElJyw=="
},
"@walmart/iteminfo-mini-app": {
- "version": "4.0.8",
- "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-4.0.8.tgz",
- "integrity": "sha512-EemuDeJm7U1p97U/+dqHjbNaWp8BeYrYSjiuRz9diVWR/3a6i3UfHaxa7dWYR313S+Qa827GnRatCvIi4ra0Ng=="
+ "version": "4.0.9",
+ "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-4.0.9.tgz",
+ "integrity": "sha512-/owYXDJQSLIgb+5B+QArKp7GbijcYCXSku/Boa/Wkeb/+Nx68wxQLlU8LUR3uqVoYGa3YvlutdhSeCtT3g9Hug=="
},
"@walmart/manager-approvals-miniapp": {
"version": "0.0.59",
--- package.json
@@ -82,7 +82,7 @@
"@walmart/functional-components": "1.0.34",
"@walmart/gta-react-native-calendars": "0.0.15",
"@walmart/gtp-shared-components": "1.2.0",
- "@walmart/iteminfo-mini-app": "4.0.8",
+ "@walmart/iteminfo-mini-app": "4.0.9",
"@walmart/impersonation-mini-app": "1.0.27",
"@walmart/ims-print-services-ui": "0.1.12",
"@walmart/inbox-mini-app": "0.26.0",
| Bumping up item info version that fixes a crash | Bumping up item info version that fixes a crash
|
9d2ae404642c220e7b40271bdc29f4b7c5fe4cef | --- core/__tests__/oneClick/useOneClickTest.tsx
@@ -0,0 +1,79 @@
+import {renderHook} from '@testing-library/react-hooks';
+import {useSelector} from 'react-redux';
+import {useOneClick} from '../../src/oneClick/useOneClick';
+import {getOneClickConfig} from '../../src/oneClick/useOneClick';
+import { ConfigData } from '@walmart/allspark-foundation/Config';
+
+// Mock redux hooks
+jest.mock('react-redux', () => ({
+ useSelector: jest.fn(),
+}));
+
+const mockUseSelector = useSelector as jest.Mock;
+
+describe('useOneClick', () => {
+ beforeEach(() => {
+ mockUseSelector.mockReset();
+ });
+
+ describe('getOneClickConfig selector', () => {
+ it('extracts oneClick config from app config data', () => {
+ const mockConfigData: ConfigData = {
+ container: {},
+ oneClick: {
+ feature1: { enable: true }
+ },
+ otherConfig: {}
+ };
+
+ const result = getOneClickConfig.resultFunc(mockConfigData);
+ expect(result).toEqual(mockConfigData.oneClick);
+ });
+
+ it('handles null config data', () => {
+ const result = getOneClickConfig.resultFunc(null);
+ expect(result).toBeUndefined();
+ });
+ });
+
+ it('returns feature config when available', () => {
+ const mockConfig = {
+ feature1: {enable: true},
+ feature2: {enable: false},
+ };
+
+ mockUseSelector.mockReturnValue(mockConfig);
+
+ const {result} = renderHook(() => useOneClick('feature1'));
+
+ expect(result.current).toEqual({enable: true});
+ });
+
+ it('returns default config when feature config is not found', () => {
+ const mockConfig = {
+ feature1: {enable: true},
+ };
+
+ mockUseSelector.mockReturnValue(mockConfig);
+
+ const {result} = renderHook(() => useOneClick('nonexistentFeature'));
+
+ expect(result.current).toEqual({enable: true});
+ });
+
+ it('returns default config when oneClick config is null', () => {
+ mockUseSelector.mockReturnValue(null);
+
+ const {result} = renderHook(() => useOneClick('feature1'));
+
+ expect(result.current).toEqual({enable: true});
+ });
+
+ it('returns default config when oneClick config is undefined', () => {
+ mockUseSelector.mockReturnValue(undefined);
+
+ const {result} = renderHook(() => useOneClick('feature1'));
+
+ expect(result.current).toEqual({enable: true});
+ });
+});
\ No newline at end of file
--- core/src/oneClick/useOneClick.ts
@@ -7,7 +7,7 @@ const DEFAULT_ONE_CLICK_CONFIG: OneClickConfig = {
enable: true,
};
-const getOneClickConfig = createSelector(
+export const getOneClickConfig = createSelector(
[ConfigSelectors.getData],
(config) => config?.oneClick,
);
| added test coverage for one click | added test coverage for one click
|
43376dcbd4ea4c59848ab1c79a993945dee98d81 | --- 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.4.0",
+ "@walmart/roster-mini-app": "2.5.0",
"@walmart/ui-components": "1.15.1",
- "@walmart/wmconnect-mini-app": "2.3.0",
+ "@walmart/wmconnect-mini-app": "2.4.0",
"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.4.0"
+ "@walmart/roster-mini-app": "npm:2.5.0"
"@walmart/ui-components": "npm:1.15.1"
- "@walmart/wmconnect-mini-app": "npm:2.3.0"
+ "@walmart/wmconnect-mini-app": "npm:2.4.0"
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.4.0":
- version: 2.4.0
- resolution: "@walmart/roster-mini-app@npm:2.4.0"
+"@walmart/roster-mini-app@npm:2.5.0":
+ version: 2.5.0
+ resolution: "@walmart/roster-mini-app@npm:2.5.0"
peerDependencies:
"@react-native-async-storage/async-storage": ^1.21.0
"@react-native-community/netinfo": ^11.0.1
@@ -6485,7 +6485,8 @@ __metadata:
"@walmart/react-native-logger": 1.34.8
"@walmart/react-native-scanner-3.0": 0.5.1
"@walmart/react-native-shared-navigation": 6.1.4
- "@walmart/react-native-sumo-sdk": 2.6.0
+ "@walmart/react-native-sumo-sdk": "*"
+ i18next: ^23.6.0
moment-timezone: ~0.5.43
npm-run-all: ^4.1.5
react-i18next: ^13.3.1
@@ -6501,7 +6502,7 @@ __metadata:
redux: ^4.2.1
redux-saga: ^1.2.3
wifi-store-locator: 1.4.1
- checksum: 10c0/4cbbac957f96c03796864b0dcaf2aaf52aa56b31625a4c6d855eaec9a22310cdc3114b4266a1abbe07b56b5233c4f0854ca0ad31f3cdb6380afd8832d5bb8d2d
+ checksum: 10c0/6ba75bb6046f2c457efa5e6673a1a58d5ccf9e3988aa3908352770dd897673a5359b00d7b28134c946ff92bb10520074f241f72f39a3515b93fa251261abe004
languageName: node
linkType: hard
@@ -6525,9 +6526,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/wmconnect-mini-app@npm:2.3.0":
- version: 2.3.0
- resolution: "@walmart/wmconnect-mini-app@npm:2.3.0"
+"@walmart/wmconnect-mini-app@npm:2.4.0":
+ version: 2.4.0
+ resolution: "@walmart/wmconnect-mini-app@npm:2.4.0"
peerDependencies:
"@react-native-async-storage/async-storage": ^1.21.0
"@react-native-community/netinfo": ^11.0.1
@@ -6567,7 +6568,7 @@ __metadata:
redux: ^4.2.1
redux-saga: ^1.2.3
wifi-store-locator: 1.4.1
- checksum: 10c0/6aeaeaf41bd50b06a792570f1f27ca2ec2b89dc6374a6409681d9b739064047a484a45c42c9a30d9b7860923e58cca1ae2a6047e6cdd97ffe5735b002627cfc0
+ checksum: 10c0/66cc0aa6f3bac72f6c18667e198c5cb95738cfd9a167ec09a8e1f28f64a9bdf1cabc4d1fb4ced10df7cb024677811420416b6b70f9a2f71122735fc978ed159c
languageName: node
linkType: hard
| feat(ui): Mini app changes for drop 23 SMDV-5921 | feat(ui): Mini app changes for drop 23 SMDV-5921
|
9a5ecc2990d4c9ec2de6e5ed8b0d14ee22843075 | --- packages/allspark-foundation/src/Feature/AllsparkFeatureModule.tsx
@@ -446,6 +446,8 @@ export class AllsparkFeatureModule<
const event = e as keyof NonNullable<
IAllsparkFeatureListeners['feature']
>;
+ // @ts-ignore - listener intersection not accepted by event manager typing
+ // but is fine functionally
const sub = this._events.addListener(event, feature[event]!, {
id: this.id,
});
| chore: typescript fix with ignore and message | chore: typescript fix with ignore and message
|
0c38ff9bf2ee38e1bd20ddceb72811baa25f431d | --- package-lock.json
@@ -4561,9 +4561,9 @@
}
},
"@walmart/core-services": {
- "version": "1.0.0-beta.7",
- "resolved": "https://npme.walmart.com/@walmart/core-services/-/core-services-1.0.0-beta.7.tgz",
- "integrity": "sha512-u7/joErdB27Uytmb4WkP5jWwJ2kjqOeTCPOO74kAr8sJQb5zD7psQbjSNrC6HzNrpBFepv5UJED9k4HmmkqLOQ==",
+ "version": "1.0.0-beta.8",
+ "resolved": "https://npme.walmart.com/@walmart/core-services/-/core-services-1.0.0-beta.8.tgz",
+ "integrity": "sha512-dResx2csOuuRQBA0pPn0Ims59UwbYY5ivJy4SOyWUjYsqdc22xlO8B65iV25czq0Ckwo5s7u/rK2mpyeUSdV0w==",
"requires": {
"@walmart/core-utils": "^0.0.2",
"axios": "^0.26.0",
@@ -4600,9 +4600,9 @@
}
},
"@walmart/core-services-allspark": {
- "version": "1.0.0-beta.18",
- "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-1.0.0-beta.18.tgz",
- "integrity": "sha512-VkIQiyS5mefNVpEAv/h14c6DUP5IKSvxjgOM8kdjLag5nEherIc4ZlK9uWL9yiiYYXxoTgPcjoXVsb5aUe5poA==",
+ "version": "1.0.0-beta.19",
+ "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-1.0.0-beta.19.tgz",
+ "integrity": "sha512-izYXS7TXX2vOfDe1AF9luuQK5fHw4ib6GJ37TO/gzBFJX4PiEUrxvSRnJCfVbxzXcL6YvQLeXza9YrUjekp5+w==",
"requires": {
"axios": "^0.26.0",
"crypto-js": "^4.1.1",
--- package.json
@@ -76,8 +76,8 @@
"@walmart/allspark-neon-core": "0.1.26",
"@walmart/ask-sam-mini-app": "0.41.7",
"@walmart/config-components": "3.0.2",
- "@walmart/core-services": "^1.0.0-beta.7",
- "@walmart/core-services-allspark": "^1.0.0-beta.18",
+ "@walmart/core-services": "^1.0.0-beta.8",
+ "@walmart/core-services-allspark": "^1.0.0-beta.19",
"@walmart/core-utils": "^0.0.2",
"@walmart/counts-component-miniapp": "0.0.35",
"@walmart/exception-mini-app": "0.41.1",
| bump core services for token fallback and log reformatting | bump core services for token fallback and log reformatting
|
7ee96035dae2d1a1a17cf3dd54323b78fdc5330e | --- targets/US/package.json
@@ -136,7 +136,7 @@
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.7.0",
"@walmart/react-native-webex-sdk": "0.3.4",
- "@walmart/receipt-check-miniapp": "1.23.4",
+ "@walmart/receipt-check-miniapp": "1.24.2",
"@walmart/redux-store": "~6.3.20",
"@walmart/returns-mini-app": "4.13.0",
"@walmart/rfid-scan-mini-app": "2.3.16",
--- yarn.lock
@@ -7114,7 +7114,7 @@ __metadata:
"@walmart/react-native-store-map": "npm:0.3.7"
"@walmart/react-native-sumo-sdk": "npm:2.7.0"
"@walmart/react-native-webex-sdk": "npm:0.3.4"
- "@walmart/receipt-check-miniapp": "npm:1.23.4"
+ "@walmart/receipt-check-miniapp": "npm:1.24.2"
"@walmart/redux-store": "npm:~6.3.20"
"@walmart/returns-mini-app": "npm:4.13.0"
"@walmart/rfid-scan-mini-app": "npm:2.3.16"
@@ -7736,9 +7736,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/receipt-check-miniapp@npm:1.23.4":
- version: 1.23.4
- resolution: "@walmart/receipt-check-miniapp@npm:1.23.4"
+"@walmart/receipt-check-miniapp@npm:1.24.2":
+ version: 1.24.2
+ resolution: "@walmart/receipt-check-miniapp@npm:1.24.2"
dependencies:
"@walmart/tcnumber": "npm:^2.3.3"
"@xstate/react": "npm:^3.0.1"
@@ -7749,7 +7749,7 @@ __metadata:
xstate: "npm:^4.32.1"
peerDependencies:
"@walmart/allspark-foundation": "*"
- checksum: 10c0/e83837597fa6a0d13d2fa20f9c64137f52f2174fd7f0aa8babaa2f798e13897ce433f098c43cb21a64c4e643e052df9fe1acd4b2a2b085338dd6bfc0c3193b7d
+ checksum: 10c0/c92d58bca9a445558548bf4d719c7651c2b7fa12dcbf6a7400ddb12f42feca47152031f29efee4f19ceff02c886ccad0e9423759bb5a2f93b453d50e89b75c86
languageName: node
linkType: hard
| update version | update version
|
cbfb42860d98cc32368ab4ba019898ce9da63ba5 | --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Components/TeamShiftSwitcher/style.ts
@@ -12,12 +12,13 @@ export const teamShiftSwitcherStyles = StyleSheet.create({
flexDirection: 'row',
gap: 8,
backgroundColor: colors.blue['130'],
- width: '100%',
+ width: '95%',
paddingVertical: 8,
paddingLeft: 8,
paddingRight: 16,
borderRadius: 100,
alignItems: 'center',
+ alignSelf: 'center',
},
shiftInfo: {
display: 'flex',
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Hub/SiteHubDashboard.tsx
@@ -189,6 +189,35 @@ export const SiteHubDashboard = ({ name, widgets }: HubDashboardProps) => {
<OnboardingScreen />
) : (
<>
+ {showHubTeamSwitcher ? (
+ <View style={{ backgroundColor: '#0071dc', minHeight: 70 }}>
+ <TeamShiftSwitcher
+ isLoading={false}
+ numTotalShifts={2}
+ teamName='Fuel'
+ teamId='1000000'
+ onPress={() => {
+ AllsparkNavigationClient.openModal(
+ 'managerExperience.supplyChain.updateModal' as any
+ );
+ setTeamState({
+ // TODO: Update for supply chain team switcher
+ teamLabel: 'Fuel',
+ teamIds: ['1000000'],
+ shifts: ['A1'],
+ });
+ }}
+ />
+ {show && ( // we only show this once
+ <Popover
+ content={`Tap here to change the team you're viewing.`}
+ handleClose={() => setShow(!show)}
+ showPopover={show}
+ UNSAFE_style={{ width: '60%' }}
+ />
+ )}
+ </View>
+ ) : null}
<ScrollView
testID='HubDashboard.View'
stickyHeaderIndices={[1]}
@@ -213,35 +242,7 @@ export const SiteHubDashboard = ({ name, widgets }: HubDashboardProps) => {
</Body>
</View>
)}
- {showHubTeamSwitcher ? (
- <>
- <TeamShiftSwitcher
- isLoading={false}
- numTotalShifts={2}
- teamName='Fuel'
- teamId='1000000'
- onPress={() => {
- AllsparkNavigationClient.openModal(
- 'managerExperience.supplyChain.updateModal' as any
- );
- setTeamState({
- // TODO: Update for supply chain team switcher
- teamLabel: 'Fuel',
- teamIds: ['1000000'],
- shifts: ['A1'],
- });
- }}
- />
- {show && ( // we only show this once
- <Popover
- content={`Tap here to change the team you're viewing.`}
- handleClose={() => setShow(!show)}
- showPopover={show}
- UNSAFE_style={{ width: '60%' }}
- />
- )}
- </>
- ) : null}
+
<AllsparkComponentContainers.Layout
container={name}
layout={allowedWidgetsList}
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Screens/UpdateTeamsModal/styles.ts
@@ -29,7 +29,7 @@ export const styles = StyleSheet.create({
fontFamily: 'Bogle-Bold',
},
filterContainer: {
- paddingHorizontal: LAYOUT_MARGIN,
+ paddingHorizontal: 10,
},
allTeamsContainer: {
paddingTop: 20,
| feat(ui): cleanup and other enhancements | feat(ui): cleanup and other enhancements
|
8c37e515ec7db8a5308cafe70e795c3d3fabc2d9 | --- package-lock.json
@@ -70,7 +70,7 @@
"@walmart/metrics-mini-app": "0.18.6",
"@walmart/mod-flex-mini-app": "1.14.6",
"@walmart/moment-walmart": "1.0.4",
- "@walmart/money-auth-shared-components": "0.1.2",
+ "@walmart/money-auth-shared-components": "0.1.4",
"@walmart/onewalmart-miniapp": "1.0.16",
"@walmart/pay-stub-miniapp": "0.15.2",
"@walmart/payrollsolution_miniapp": "0.138.1",
@@ -9447,9 +9447,9 @@
}
},
"node_modules/@walmart/money-auth-shared-components": {
- "version": "0.1.2",
- "resolved": "https://npme.walmart.com/@walmart/money-auth-shared-components/-/money-auth-shared-components-0.1.2.tgz",
- "integrity": "sha512-w7RfHsfSJaB/xbM3HRpO2/cE1iah+04d+7KhETEKymc0n0X1VNxgVVHYs6jWUUCRmJ6jl3z2AQyfcLjosaiCYw==",
+ "version": "0.1.4",
+ "resolved": "https://npme.walmart.com/@walmart/money-auth-shared-components/-/money-auth-shared-components-0.1.4.tgz",
+ "integrity": "sha512-CMZ3PyFYcBxAoBCMekd6OKi/bqYYbEiZsRghgfz0iaMT6T/yjEHAxVyPrnJ06IyJuc+fVXu4GetWk4z1fKFuEw==",
"hasInstallScript": true,
"peerDependencies": {
"@react-navigation/native": "^6.0.0",
@@ -33507,9 +33507,9 @@
"version": "1.0.4"
},
"@walmart/money-auth-shared-components": {
- "version": "0.1.2",
- "resolved": "https://npme.walmart.com/@walmart/money-auth-shared-components/-/money-auth-shared-components-0.1.2.tgz",
- "integrity": "sha512-w7RfHsfSJaB/xbM3HRpO2/cE1iah+04d+7KhETEKymc0n0X1VNxgVVHYs6jWUUCRmJ6jl3z2AQyfcLjosaiCYw=="
+ "version": "0.1.4",
+ "resolved": "https://npme.walmart.com/@walmart/money-auth-shared-components/-/money-auth-shared-components-0.1.4.tgz",
+ "integrity": "sha512-CMZ3PyFYcBxAoBCMekd6OKi/bqYYbEiZsRghgfz0iaMT6T/yjEHAxVyPrnJ06IyJuc+fVXu4GetWk4z1fKFuEw=="
},
"@walmart/onewalmart-miniapp": {
"version": "1.0.16",
--- package.json
@@ -111,7 +111,7 @@
"@walmart/metrics-mini-app": "0.18.6",
"@walmart/mod-flex-mini-app": "1.14.6",
"@walmart/moment-walmart": "1.0.4",
- "@walmart/money-auth-shared-components": "0.1.2",
+ "@walmart/money-auth-shared-components": "0.1.4",
"@walmart/onewalmart-miniapp": "1.0.16",
"@walmart/pay-stub-miniapp": "0.15.2",
"@walmart/payrollsolution_miniapp": "0.138.1",
| bump version | bump version
|
ec637d6192330bce1fe483ef31dc9efd61fa3420 | --- react-native.config.js
@@ -2,6 +2,11 @@ module.exports = {
project: {
ios: {},
android: {},
+ dependencies: {
+ ...(process.env.CI
+ ? {'react-native-flipper': {platforms: {ios: null}}}
+ : {}),
+ },
},
assets: ['node_modules/@walmart/ui-components/assets'],
};
| chore: disable flipper dependency on ios ci | chore: disable flipper dependency on ios ci
|
26f2fc3c27315180505e1ac75262dfef29dcb031 | --- packages/allspark-foundation/src/Feature/AllsparkFeature.tsx
@@ -19,7 +19,7 @@ import {
TelemetryManagerConfig,
TelemetryModule,
} from '../Telemetry';
-import { TranslationModule } from '../Translation';
+import { TranslationFeatureClient, TranslationModule } from '../Translation';
import { GeolocationService, IMeGeoLocationManager } from '../Geolocation';
import {
AllsparkModalComponent,
@@ -154,7 +154,7 @@ export class AllsparkFeature<ID extends string = string> {
* MyTranslationClient.translate(...);
* MyTranslationClient.useTranslation(...);
*/
- public createTranslationClient = () => {
+ public createTranslationClient = (): TranslationFeatureClient<typeof this.id> => {
return TranslationModule.factory.createFeatureClient(this.id);
};
--- packages/allspark-foundation/src/Translation/TranslationFactory.tsx
@@ -38,7 +38,7 @@ export class TranslationFactory {
public createFeatureClient = <K extends string>(
id: K,
config?: Omit<TranslationFeatureClientConfig, 'client'>
- ): TranslationFeatureClient => {
+ ): TranslationFeatureClient<K> => {
if (!id) {
throw new Error(
'[TranslationFactory] createFeatureClient: invalid feature ID'
@@ -46,7 +46,7 @@ export class TranslationFactory {
}
if (this._featureClients[id]) {
- return this._featureClients[id] as TranslationFeatureClient;
+ return this._featureClients[id] as TranslationFeatureClient<K>;
}
const featureClient = new TranslationFeatureClient<K>(id, {
--- packages/allspark-foundation/src/Translation/TranslationFeatureClient.ts
@@ -20,7 +20,7 @@ export type TranslationFeatureClientConfig = {
* This client requires an id during construction and all methods
* operate within that scoped namespace.
*/
-export class TranslationFeatureClient<K extends string = string> implements ITranslationFeatureClient {
+export class TranslationFeatureClient<K extends string> implements ITranslationFeatureClient {
private _id: K;
private _client: TranslationClient;
| fix(ALLSPARK-7221): incorrect typing for translation feature client | fix(ALLSPARK-7221): incorrect typing for translation feature client
* refactor: ALLSPARK-7221 add type for translation feature client in feature
* chore: fix typing
---------
Co-authored-by: Dylan Lane - rlane1 <Russell.Lane@walmart.com> |
0e207f526cf5503300ec6920eeac69f6307bcc9a | --- __tests__/config/HubConfig.test.tsx
@@ -8,6 +8,9 @@
import {jest} from '@jest/globals';
import {ErrorInfo} from 'react';
+// Import the module to test
+import {createHubConfig} from '../../packages/associate-exp-hub-mini-app/src/config/HubConfig';
+
// Define reusable mocks for telemetry functions that we can assert against in tests
const mockLogEvent = jest.fn();
const mockLogErrorEvent = jest.fn();
@@ -32,7 +35,7 @@ jest.mock('../../packages/associate-exp-hub-mini-app/src/config/HubConfig', () =
has_layout_adapter: true,
has_error_handling: true
});
-
+
return {
id: 'AssociateExpHub.Hub',
getLayout: jest.fn(async () => {
@@ -41,10 +44,10 @@ jest.mock('../../packages/associate-exp-hub-mini-app/src/config/HubConfig', () =
hub_id: 'AssociateExpHub.Hub',
widget_management: enableWidgetManagement
});
-
+
return [
- { widgetId: 'widget1', name: 'Test Widget 1', visible: true },
- { widgetId: 'widget2', name: 'Test Widget 2', visible: true }
+ {widgetId: 'widget1', name: 'Test Widget 1', visible: true},
+ {widgetId: 'widget2', name: 'Test Widget 2', visible: true}
];
}),
onError: jest.fn((error, _errorInfo) => {
@@ -82,7 +85,7 @@ jest.mock('../../packages/associate-exp-hub-mini-app/src/config/HubConfig', () =
},
};
});
-
+
return {
createHubConfig,
__esModule: true,
@@ -148,13 +151,10 @@ jest.mock('@walmart/roster-mini-app', () => ({
default: {registerRosterComponents: jest.fn()}
}));
-// Import the module to test
-import {createHubConfig} from '../../packages/associate-exp-hub-mini-app/src/config/HubConfig';
-
// Reset mocks before each test
beforeEach(() => {
jest.clearAllMocks();
-
+
// Setup default mock implementations
mockGetCurrentUserContext.mockReturnValue({
teamId: 'test-team-123',
--- packages/associate-exp-hub-mini-app/src/config/HubConfig.tsx
@@ -406,7 +406,6 @@ export const createHubConfig = (
const configCreatedEventName = formatTelemetryEventName('hub_config_created');
AssociateExpHubTelemetry.logEvent(configCreatedEventName, {
hub_id: hubId,
- widget_management: enableWidgetManagement,
has_layout_adapter: !!hubConfig.layoutAdapter,
has_error_handling: !!hubConfig.onError,
has_redux_mapping: !!hubConfig.reduxStateMapping,
| feat(ui): update tests | feat(ui): update tests
|
7eea130941cfb00caa498de8b989b8d6d378491e | --- package-lock.json
@@ -45,7 +45,7 @@
"@walmart/config-components": "4.2.1",
"@walmart/copilot-mini-app": "1.77.9",
"@walmart/core-services": "~2.1.1",
- "@walmart/core-services-allspark": "~2.11.1",
+ "@walmart/core-services-allspark": "~2.12.5",
"@walmart/core-utils": "~2.0.5",
"@walmart/core-widget-registry": "~1.2.4",
"@walmart/counts-component-miniapp": "0.1.5",
@@ -8121,16 +8121,16 @@
}
},
"node_modules/@walmart/core-services-allspark": {
- "version": "2.11.1",
- "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-2.11.1.tgz",
- "integrity": "sha512-7R77weaFSwdRTnRqPQyLBGZRVwfWUZHwXPGSG/vbGGKrAUj9Nbg3DGWFhKg0VS2+6qHPGVe215I7pqLF7xa/4w==",
+ "version": "2.12.5",
+ "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-2.12.5.tgz",
+ "integrity": "sha512-hX5xoYDyke3YqsjPePVxMS6DoxYHJPJ0+79/KHL3ytpsMEWRnltWFD7DF4PhoZZEmYW88g1iqO6SOyPkkSYdSA==",
"license": "ISC",
"dependencies": {
"@walmart/allspark-graphql-client": "^1.4.10",
"@walmart/allspark-http-client": "^2.4.17",
"@walmart/allspark-utils": "^1.6.1",
- "@walmart/core-services": "^2.1.1",
- "@walmart/me-at-walmart-athena-queries": "^1.3.11",
+ "@walmart/core-services": "^2.2.0",
+ "@walmart/me-at-walmart-athena-queries": "^1.7.0",
"crypto-js": "~4.1.1",
"jwt-decode": "^3.1.2",
"luxon": "^2.4.0",
@@ -8593,7 +8593,9 @@
}
},
"node_modules/@walmart/me-at-walmart-athena-queries": {
- "version": "1.3.11",
+ "version": "1.7.0",
+ "resolved": "https://npme.walmart.com/@walmart/me-at-walmart-athena-queries/-/me-at-walmart-athena-queries-1.7.0.tgz",
+ "integrity": "sha512-Y/7ZAEGwM3oKB0XGajgZxpBq/Mth3Q38phSqUmRtQYtr7/XfhdpcjPDiJCqIq9QSHlR4+uwx3jsKPWslk0F+BA==",
"license": "ISC",
"dependencies": {
"@walmart/allspark-graphql-client": "^1.4.10"
@@ -33548,15 +33550,15 @@
}
},
"@walmart/core-services-allspark": {
- "version": "2.11.1",
- "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-2.11.1.tgz",
- "integrity": "sha512-7R77weaFSwdRTnRqPQyLBGZRVwfWUZHwXPGSG/vbGGKrAUj9Nbg3DGWFhKg0VS2+6qHPGVe215I7pqLF7xa/4w==",
+ "version": "2.12.5",
+ "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-2.12.5.tgz",
+ "integrity": "sha512-hX5xoYDyke3YqsjPePVxMS6DoxYHJPJ0+79/KHL3ytpsMEWRnltWFD7DF4PhoZZEmYW88g1iqO6SOyPkkSYdSA==",
"requires": {
"@walmart/allspark-graphql-client": "^1.4.5",
"@walmart/allspark-http-client": "^2.4.13",
"@walmart/allspark-utils": "^1.5.2",
"@walmart/core-services": "~2.1.1",
- "@walmart/me-at-walmart-athena-queries": "^1.3.11",
+ "@walmart/me-at-walmart-athena-queries": "^1.7.0",
"crypto-js": "^3.3.0",
"jwt-decode": "^3.1.2",
"luxon": "^1.28.0",
@@ -33675,7 +33677,9 @@
"version": "0.2.4"
},
"@walmart/me-at-walmart-athena-queries": {
- "version": "1.3.11",
+ "version": "1.7.0",
+ "resolved": "https://npme.walmart.com/@walmart/me-at-walmart-athena-queries/-/me-at-walmart-athena-queries-1.7.0.tgz",
+ "integrity": "sha512-Y/7ZAEGwM3oKB0XGajgZxpBq/Mth3Q38phSqUmRtQYtr7/XfhdpcjPDiJCqIq9QSHlR4+uwx3jsKPWslk0F+BA==",
"requires": {
"@walmart/allspark-graphql-client": "^1.4.5"
}
--- package.json
@@ -86,7 +86,7 @@
"@walmart/config-components": "4.2.1",
"@walmart/copilot-mini-app": "1.77.9",
"@walmart/core-services": "~2.1.1",
- "@walmart/core-services-allspark": "~2.11.1",
+ "@walmart/core-services-allspark": "~2.12.5",
"@walmart/core-utils": "~2.0.5",
"@walmart/core-widget-registry": "~1.2.4",
"@walmart/counts-component-miniapp": "0.1.5",
| chore: update core services for mgql headers | chore: update core services for mgql headers
|
bfa7266ae7c169cd2b9d6217786a288efe0d390b | --- .github/new_pr_template.md
--- package.json
@@ -95,7 +95,7 @@
"@walmart/react-native-shared-navigation": "6.1.4",
"@walmart/react-native-sumo-sdk": "2.8.0",
"@walmart/redux-store": "6.3.29",
- "@walmart/roster-mini-app": "2.42.0",
+ "@walmart/roster-mini-app": "2.42.1",
"@walmart/ui-components": "1.15.1",
"@walmart/wmconnect-mini-app": "2.38.0",
"babel-jest": "^29.6.3",
--- yarn.lock
@@ -7047,7 +7047,7 @@ __metadata:
"@walmart/react-native-shared-navigation": "npm:6.1.4"
"@walmart/react-native-sumo-sdk": "npm:2.8.0"
"@walmart/redux-store": "npm:6.3.29"
- "@walmart/roster-mini-app": "npm:2.42.0"
+ "@walmart/roster-mini-app": "npm:2.42.1"
"@walmart/ui-components": "npm:1.15.1"
"@walmart/wmconnect-mini-app": "npm:2.38.0"
babel-jest: "npm:^29.6.3"
@@ -7173,51 +7173,24 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/roster-mini-app@npm:2.42.0":
- version: 2.42.0
- resolution: "@walmart/roster-mini-app@npm:2.42.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2Froster-mini-app-2.42.0.tgz"
- peerDependencies:
- "@react-native-async-storage/async-storage": ^1.21.0
- "@react-native-community/netinfo": ^11.0.1
- "@react-native-firebase/analytics": ~17.4.2
- "@react-native-firebase/crashlytics": ~17.4.2
- "@react-native-firebase/database": ~17.4.2
- "@react-native-firebase/perf": ~17.4.2
- "@react-navigation/drawer": ^6.6.4
- "@react-navigation/native": ^6.0.8
- "@reduxjs/toolkit": ^1.9.7
- "@types/node": 20.5.9
- "@walmart/allspark-authentication": 6.1.4
- "@walmart/allspark-graphql-client": ^1.4.6
- "@walmart/allspark-http-client": 6.1.4
- "@walmart/config-components": 4.4.0
- "@walmart/core-services": 6.1.4
- "@walmart/core-services-allspark": 6.25.1
- "@walmart/core-utils": 6.1.4
- "@walmart/functional-components": 6.1.4
- "@walmart/gtp-shared-components": 2.2.4
- "@walmart/react-native-encrypted-storage": ~1.1.3
- "@walmart/react-native-logger": 1.34.8
- "@walmart/react-native-scanner-3.0": 0.5.1
- "@walmart/react-native-shared-navigation": 6.1.4
- "@walmart/react-native-sumo-sdk": "*"
- i18next: ^23.6.0
- moment-timezone: ~0.5.43
- npm-run-all: ^4.1.5
- react-i18next: ^13.3.1
- react-native-apollo-devtools-client: ^1.0.4
- react-native-app-auth: ^6.4.3
- react-native-device-info: ~10.13.1
- react-native-gesture-handler: ^2.14.0
- react-native-get-random-values: ~1.10.0
- react-native-reanimated: ^3.6.0
- react-native-safe-area-context: ^4.8.2
- react-native-screens: ^3.28.0
- react-native-wm-telemetry: 6.1.4
- redux: ^4.2.1
- redux-saga: ^1.2.3
- wifi-store-locator: 1.4.1
- checksum: 10c0/ff6cffa67d3e17842dd3ebb9cfaca498372abbbcf7339b1689aaa7970840f43cc228902c3ed79904bc53f91ffa99638909254f399d589a4bf4286b255ab01bec
+"@walmart/roster-mini-app@npm:2.42.1":
+ version: 2.42.1
+ resolution: "@walmart/roster-mini-app@npm:2.42.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-2.42.1.tgz"
+ dependencies:
+ expo: "npm:~52.0.46"
+ react: "npm:18.3.1"
+ react-native: "npm:0.76.9"
+ peerDependencies:
+ "@walmart/allspark-foundation": ">=6.32.0"
+ expo: ~52.0.46
+ expo-image: ~2.0.7
+ react: "*"
+ react-native: "*"
+ react-native-wm-config: 0.1.1
+ dependenciesMeta:
+ "@walmart/me-at-walmart":
+ built: false
+ checksum: 10c0/f34767086633b73bb37b012ced827a3328bcd7c4b8cf6fc231ad48e912e34a25927f76baaa743da9477cb1dbb0850b3739c5b8aee87925afbcd9108016a88096
languageName: node
linkType: hard
| feat(ui): updating version | feat(ui): updating version
|
b6bb3d006126b65de6b8aa7c5f307f437ea0277b | --- .solidarity
@@ -20,7 +20,7 @@
"rule": "cli",
"binary": "pod",
"platform": "darwin",
- "semver": ">=1.13 <1.15"
+ "semver": ">=1.12.0 <1.15.0"
}
]
}
| Updated solidarity checks | Updated solidarity checks
|
219ea84aaccc025530558f34e64f710f07698d9c | --- src/components/TeamList.tsx
@@ -401,7 +401,7 @@ export const TeamChatCard = (props: {
<ListItem UNSAFE_style={styles.workgroupListItemContainer}>
{workgroupKey === primaryWorkGroup && (
<Text style={styles.workgroupMyTeamOrAreaHeader}>
- My area
+ {t('rosterScreen.teamWorkgroup.myArea')}
</Text>
)}
<Text style={styles.workgroupHeader}>{workgroupName}</Text>
@@ -441,7 +441,9 @@ export const TeamChatCard = (props: {
{primaryTeam.length > 0 ? (
<>
<ListItem UNSAFE_style={styles.workgroupMyTeamHeaderContainer}>
- <Text style={styles.workgroupMyTeamOrAreaHeader}>My Team</Text>
+ <Text style={styles.workgroupMyTeamOrAreaHeader}>
+ {t('rosterScreen.teamWorkgroup.myTeam')}
+ </Text>
</ListItem>
<TeamItem
teamId={primaryTeam}
--- src/components/TeamList.tsx
@@ -401,7 +401,7 @@ export const TeamChatCard = (props: {
<ListItem UNSAFE_style={styles.workgroupListItemContainer}>
{workgroupKey === primaryWorkGroup && (
<Text style={styles.workgroupMyTeamOrAreaHeader}>
- My area
+ {t('rosterScreen.teamWorkgroup.myArea')}
</Text>
)}
<Text style={styles.workgroupHeader}>{workgroupName}</Text>
@@ -441,7 +441,9 @@ export const TeamChatCard = (props: {
{primaryTeam.length > 0 ? (
<>
<ListItem UNSAFE_style={styles.workgroupMyTeamHeaderContainer}>
- <Text style={styles.workgroupMyTeamOrAreaHeader}>My Team</Text>
+ <Text style={styles.workgroupMyTeamOrAreaHeader}>
+ {t('rosterScreen.teamWorkgroup.myTeam')}
+ </Text>
</ListItem>
<TeamItem
teamId={primaryTeam}
| adding translations | adding translations
|
852eea8415d494f38bd8f2f7090f1baa68f70168 | --- package.json
@@ -73,6 +73,7 @@
"@react-navigation/stack": "^6.1.0",
"@sharcoux/slider": "^6.1.1",
"@terrylinla/react-native-sketch-canvas": "0.8.0",
+ "@walmart/OneWalmart-MiniApp": "1.0.12",
"@walmart/allspark-graphql-client": "^0.1.0",
"@walmart/allspark-home-mini-app": "0.6.14",
"@walmart/allspark-neon-core": "0.1.31",
@@ -103,7 +104,6 @@
"@walmart/metrics-mini-app": "0.9.36",
"@walmart/mod-flex-mini-app": "1.3.15",
"@walmart/moment-walmart": "1.0.4",
- "@walmart/OneWalmart-MiniApp": "1.0.12",
"@walmart/pay-stub-miniapp": "0.9.7",
"@walmart/payrollsolution_miniapp": "0.130.14",
"@walmart/price-changes-mini-app": "1.6.10",
| drop 9 update for receipt check | drop 9 update for receipt check
|
2a6f275d243786151f384f6298220a675c9620c2 | --- patches/@walmart+profile-feature-app+0.0.71.patch
@@ -1,13 +0,0 @@
-diff --git a/node_modules/@walmart/profile-feature-app/dist/config/appConfigDefault.js b/node_modules/@walmart/profile-feature-app/dist/config/appConfigDefault.js
-index 137f36e..ee8e749 100644
---- a/node_modules/@walmart/profile-feature-app/dist/config/appConfigDefault.js
-+++ b/node_modules/@walmart/profile-feature-app/dist/config/appConfigDefault.js
-@@ -119,7 +119,7 @@ defaultAppConfig[ME_AT_WALMART] = {
- personalSettingsPhoneEnabled: false,
- personalSettingsAddressEnabled: false,
- // FWB Components
-- moneyHintsCarouselEnabled: false,
-+ moneyHintsCarouselEnabled: true,
- directDepositTileCardEnabled: true,
- myMoneyScreenVisible: false,
- };
| Delete @walmart+profile-feature-app+0.0.71.patch | Delete @walmart+profile-feature-app+0.0.71.patch
|
d4fb6d12c5b4ab951d0abc2b2449e5ba882a640e | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/roster-mini-app",
- "version": "3.3.0-alpha.4",
+ "version": "3.3.0-alpha.5",
"main": "dist/index.js",
"files": [
"dist",
@@ -89,7 +89,7 @@
"@walmart/react-native-scanner-3.0": "0.10.4",
"@walmart/react-native-sumo-sdk": "2.8.0",
"@walmart/ui-components": "1.15.1",
- "@walmart/wmconnect-mini-app": "3.2.0-alpha.4",
+ "@walmart/wmconnect-mini-app": "3.2.0-alpha.6",
"babel-jest": "^29.6.3",
"chance": "^1.1.11",
"crypto-js": "~4.2.0",
--- yarn.lock
@@ -6368,7 +6368,7 @@ __metadata:
"@walmart/react-native-scanner-3.0": "npm:0.10.4"
"@walmart/react-native-sumo-sdk": "npm:2.8.0"
"@walmart/ui-components": "npm:1.15.1"
- "@walmart/wmconnect-mini-app": "npm:3.2.0-alpha.4"
+ "@walmart/wmconnect-mini-app": "npm:3.2.0-alpha.6"
babel-jest: "npm:^29.6.3"
chance: "npm:^1.1.11"
crypto-js: "npm:~4.2.0"
@@ -6451,9 +6451,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/wmconnect-mini-app@npm:3.2.0-alpha.4":
- version: 3.2.0-alpha.4
- resolution: "@walmart/wmconnect-mini-app@npm:3.2.0-alpha.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-3.2.0-alpha.4.tgz"
+"@walmart/wmconnect-mini-app@npm:3.2.0-alpha.6":
+ version: 3.2.0-alpha.6
+ resolution: "@walmart/wmconnect-mini-app@npm:3.2.0-alpha.6::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-3.2.0-alpha.6.tgz"
peerDependencies:
"@walmart/allspark-foundation": ">=6.32.0"
expo: ~52.0.46
@@ -6464,7 +6464,7 @@ __metadata:
dependenciesMeta:
"@walmart/me-at-walmart":
built: false
- checksum: 10c0/caacd0d342aee015360fea98c39054c837a045e21df2945eaf64ebc94ab85801250b6fa83603e4f4ac85018dcf66acf7d32ec6a3cc77f2bd67b275355dfe508b
+ checksum: 10c0/a7daf649bc8bd6e0b6e4bb2cc24398de92ea7e903361ca9a6e4c4469811f1af8f14f354b9e1822f3ae92311d896b546d00c4e9f88c3179d4414d5fec3543a67e
languageName: node
linkType: hard
| feat(ui): adding new version for drop 34 | feat(ui): adding new version for drop 34
|
33bce3f401878e94737f453f652044babc66bce5 | --- packages/allspark-foundation/__tests__/User/components/selector.test.tsx
@@ -1,6 +1,6 @@
import { UserSelectors, fullNameFromFields, getFirstFromFullName, getNameFromUser, getFirstNameFromUser } from '../../../src/User/selectors';
-import { User } from '../../../src/User//types';
+import { User } from '../../../src/User/types';
jest.mock('namecase', () => jest.fn((name) => name));
| code clean up | code clean up
|
4048b66275a0d42b72b1ad2218ed86bcacdd973e | --- core/__tests__/features/TimeclockTest.tsx
@@ -16,56 +16,37 @@ import {
onStartImpersonation,
onExitImpersonation,
} from '../../src/features/timeclock';
-
- describe('onStartImpersonation', () => {
- const action = {
- type: 'START_IMPERSONATION',
- payload: {
- punch: {
- lastPunchType: '1',
- },
- },
- };
- const TimeClockFeature = new AllsparkFeature('timeclock');
- const TimeClockLocalStorage = TimeClockFeature.createLocalStorage({});
- it('set TimeClockLocalStorage to set geo validation to true', () => {
- const generator = onStartImpersonation(action);
- expect(generator.next().value).toEqual(
- put(PunchActions.setLastPunchType('01', 'KGraphApi')),
- );
- expect(generator.next(false).value).toEqual(
- call(TimeClockLocalStorage.get, 'impersonation_geo_validation'),
- );
- expect(generator.next(false).value).toEqual(
- select(ClockAppSelectors.getGeoValidationDisabled),
- );
- expect(generator.next(false).value).toEqual(
- call(TimeClockLocalStorage.set, 'impersonation_geo_validation', 'true'),
- );
- expect(generator.next().done).toBeTruthy();
- });
+
+
+describe('onStartImpersonation', () => {
+ const action = {
+ type: 'START_IMPERSONATION',
+ payload: { punch: { lastPunchType: '1' } }
+ };
+ const TimeClockFeature = new AllsparkFeature('timeclock');
+ const TimeClockLocalStorage = TimeClockFeature.createLocalStorage({});
+ it('set TimeClockLocalStorage to set geo validation to true', () => {
+ const generator = onStartImpersonation(action);
+ expect(generator.next().value).toEqual(put(PunchActions.setLastPunchType('01', 'KGraphApi')));
+ expect(generator.next(false).value).toEqual(call(TimeClockLocalStorage.get, 'impersonation_geo_validation'));
+ expect(generator.next(false).value).toEqual(select(ClockAppSelectors.getGeoValidationDisabled));
+ expect(generator.next(false).value).toEqual(call(TimeClockLocalStorage.set, 'impersonation_geo_validation', 'true'));
+ expect(generator.next().done).toBeTruthy();
});
+});
- describe('onExitImpersonation', () => {
- const TimeClockFeature = new AllsparkFeature('timeclock');
- const TimeClockLocalStorage = TimeClockFeature.createLocalStorage({});
- it('should dispatch actions and remove geo validation key', () => {
- const generator = onExitImpersonation();
- expect(generator.next().value).toEqual(
- put(ClockAppActions.setDisableGeoValidation(false)),
- );
- expect(generator.next().value).toEqual(
- put(PunchActions.setLastPunchType(null, null)),
- );
- expect(generator.next().value).toEqual(
- put(PunchActions.setLastPunchTime(null)),
- );
- expect(generator.next().value).toEqual(
- call(TimeClockLocalStorage.remove, 'impersonation_geo_validation'),
- );
- expect(generator.next().done).toBeTruthy();
- });
+describe('onExitImpersonation', () => {
+ const TimeClockFeature = new AllsparkFeature('timeclock');
+ const TimeClockLocalStorage = TimeClockFeature.createLocalStorage({});
+ it('should dispatch actions and remove geo validation key', () => {
+ const generator = onExitImpersonation();
+ expect(generator.next().value).toEqual(put(ClockAppActions.setDisableGeoValidation(false)));
+ expect(generator.next().value).toEqual(put(PunchActions.setLastPunchType(null, null)));
+ expect(generator.next().value).toEqual(put(PunchActions.setLastPunchTime(null)));
+ expect(generator.next().value).toEqual(call(TimeClockLocalStorage.remove, 'impersonation_geo_validation'));
+ expect(generator.next().done).toBeTruthy();
});
+});
describe('TimeClockFeature', () => {
it('should have the correct name', () => {
@@ -80,5 +61,4 @@ describe('TimeClockFeature', () => {
TimeClockFeature._screens.timeClock.getComponent();
expect(TimeClockFeature._screens.timeClock.options.headerShown).toBe(false);
});
-});
-
+});
\ No newline at end of file
| lint fix | lint fix
|
c0ee0980d02f09fe79d18787bb0f10cecc398273 | --- src/screens/RosterDetailScreen/mocks/types/supplyChain.ts
@@ -14,6 +14,7 @@ export interface SupplyChainTeamAssociateMembership {
functionCode: string;
functionCodeDesc: string;
// Additional fields for UI purposes
+ // TODO: Comfirm from Athena if this is the right place to get clock status
clockStatus?: {
status: 'IN' | 'OUT';
time: string;
| add TODO for clockstatus | add TODO for clockstatus
|
eefd7e405eaffd0aaa5a8daca97afbd1332082a5 | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/myteam-mini-app",
- "version": "3.0.2-alpha.10",
+ "version": "3.0.2-alpha.11",
"main": "dist/index.js",
"files": [
"dist",
@@ -77,9 +77,9 @@
"@walmart/allspark-authentication": "6.4.1",
"@walmart/allspark-components-library": "1.1.0",
"@walmart/allspark-foundation": "^6.32.0",
- "@walmart/allspark-foundation-hub": "1.12.0-beta.4979+2eb5821e",
+ "@walmart/allspark-foundation-hub": "1.13.0-beta.5047+b433a2a7",
"@walmart/allspark-utils": "6.5.1",
- "@walmart/associate-exp-hub-mini-app": "1.4.0-alpha.12",
+ "@walmart/associate-exp-hub-mini-app": "1.4.0-alpha.18",
"@walmart/config-components": "4.6.5",
"@walmart/expo-config-plugins": "0.1.4",
"@walmart/gtp-shared-components": "2.2.4",
@@ -90,9 +90,9 @@
"@walmart/react-native-logger": "1.35.0",
"@walmart/react-native-scanner-3.0": "0.10.4",
"@walmart/react-native-sumo-sdk": "2.8.0",
- "@walmart/roster-mini-app": "3.2.0-alpha.9",
+ "@walmart/roster-mini-app": "3.2.0-alpha.10",
"@walmart/ui-components": "1.15.1",
- "@walmart/wmconnect-mini-app": "3.1.1-alpha.0",
+ "@walmart/wmconnect-mini-app": "3.2.0-alpha.5",
"babel-jest": "^29.6.3",
"chance": "^1.1.11",
"crypto-js": "~4.2.0",
--- yarn.lock
@@ -6600,9 +6600,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/allspark-foundation-hub@npm:1.12.0-beta.4979+2eb5821e":
- version: 1.12.0-beta.4979
- resolution: "@walmart/allspark-foundation-hub@npm:1.12.0-beta.4979::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fallspark-foundation-hub%2F-%2F%40walmart%2Fallspark-foundation-hub-1.12.0-beta.4979.tgz"
+"@walmart/allspark-foundation-hub@npm:1.13.0-beta.5047+b433a2a7":
+ version: 1.13.0-beta.5047
+ resolution: "@walmart/allspark-foundation-hub@npm:1.13.0-beta.5047::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fallspark-foundation-hub%2F-%2F%40walmart%2Fallspark-foundation-hub-1.13.0-beta.5047.tgz"
peerDependencies:
"@react-navigation/native": 6.x
"@walmart/allspark-foundation": ">=6.27"
@@ -6612,7 +6612,7 @@ __metadata:
react: "*"
react-native: "*"
react-native-safe-area-context: 4.x
- checksum: 10c0/5285297b4f9ec1257cf736f1999959501ff330c428151929225076cc3fb84e992fa3e5878e983f2428542d959999792e7575fe58ce51e3f4b4ec3d7c3b876a5b
+ checksum: 10c0/7d065b8f7b4a0970714edfc307e0c94acf3f79b79fe9a7a098612cde0030e4654e8b30cb4130255c4501ab3faafb68a0a73baef6724101e14df2972576c1c6ee
languageName: node
linkType: hard
@@ -6722,18 +6722,18 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/associate-exp-hub-mini-app@npm:1.4.0-alpha.12":
- version: 1.4.0-alpha.12
- resolution: "@walmart/associate-exp-hub-mini-app@npm:1.4.0-alpha.12::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fassociate-exp-hub-mini-app%2F-%2F%40walmart%2Fassociate-exp-hub-mini-app-1.4.0-alpha.12.tgz"
+"@walmart/associate-exp-hub-mini-app@npm:1.4.0-alpha.18":
+ version: 1.4.0-alpha.18
+ resolution: "@walmart/associate-exp-hub-mini-app@npm:1.4.0-alpha.18::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fassociate-exp-hub-mini-app%2F-%2F%40walmart%2Fassociate-exp-hub-mini-app-1.4.0-alpha.18.tgz"
peerDependencies:
"@walmart/allspark-foundation": ">=6.32.0"
- "@walmart/allspark-foundation-hub": 1.12.0-beta.4979+2eb5821e
+ "@walmart/allspark-foundation-hub": 1.13.0-beta.5047+b433a2a7
expo: 52.x
expo-image: "*"
react: "*"
react-native: "*"
react-native-safe-area-context: "*"
- checksum: 10c0/28cc5c3ae6d0fb901124a741cf83e6e5079c37122e867abeda7128eb8a30d2b087ec4558d02c505879222a6a81600f10d5957664c5382aa5f90ab896a304ee74
+ checksum: 10c0/e36fb35fa2f0bbdb3db237c168afa102e8cc7ad95e364994a4f84b3d49742028da5db9c0f25dae89797ab0694c4e9d19f84a0511c08ad78e5f68276e8f6bf50b
languageName: node
linkType: hard
@@ -6931,9 +6931,9 @@ __metadata:
"@walmart/allspark-authentication": "npm:6.4.1"
"@walmart/allspark-components-library": "npm:1.1.0"
"@walmart/allspark-foundation": "npm:^6.32.0"
- "@walmart/allspark-foundation-hub": "npm:1.12.0-beta.4979+2eb5821e"
+ "@walmart/allspark-foundation-hub": "npm:1.13.0-beta.5047+b433a2a7"
"@walmart/allspark-utils": "npm:6.5.1"
- "@walmart/associate-exp-hub-mini-app": "npm:1.4.0-alpha.12"
+ "@walmart/associate-exp-hub-mini-app": "npm:1.4.0-alpha.18"
"@walmart/config-components": "npm:4.6.5"
"@walmart/expo-config-plugins": "npm:0.1.4"
"@walmart/gtp-shared-components": "npm:2.2.4"
@@ -6944,9 +6944,9 @@ __metadata:
"@walmart/react-native-logger": "npm:1.35.0"
"@walmart/react-native-scanner-3.0": "npm:0.10.4"
"@walmart/react-native-sumo-sdk": "npm:2.8.0"
- "@walmart/roster-mini-app": "npm:3.2.0-alpha.9"
+ "@walmart/roster-mini-app": "npm:3.2.0-alpha.10"
"@walmart/ui-components": "npm:1.15.1"
- "@walmart/wmconnect-mini-app": "npm:3.1.1-alpha.0"
+ "@walmart/wmconnect-mini-app": "npm:3.2.0-alpha.5"
babel-jest: "npm:^29.6.3"
chance: "npm:^1.1.11"
crypto-js: "npm:~4.2.0"
@@ -7052,9 +7052,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/roster-mini-app@npm:3.2.0-alpha.9":
- version: 3.2.0-alpha.9
- resolution: "@walmart/roster-mini-app@npm:3.2.0-alpha.9::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-3.2.0-alpha.9.tgz"
+"@walmart/roster-mini-app@npm:3.2.0-alpha.10":
+ version: 3.2.0-alpha.10
+ resolution: "@walmart/roster-mini-app@npm:3.2.0-alpha.10::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-3.2.0-alpha.10.tgz"
dependencies:
expo: "npm:~52.0.46"
react: "npm:18.3.1"
@@ -7069,7 +7069,7 @@ __metadata:
dependenciesMeta:
"@walmart/me-at-walmart":
built: false
- checksum: 10c0/614c7986c10456e565c0256d19873e8b33edc7f2d0e067d087329ab55b869e6dc39d50f3d8462956e482a5f068d43b8b03633f6fee3d758d31c984c737a4a275
+ checksum: 10c0/0ee963346295a8bf58b1ae9bfd8f18aed40ca7e8ff7ac6f26d0239067f6c09aec1d2d18dac20bf41d535a189f987a9215ea07ddace3ac9fd98acc8bb1b127598
languageName: node
linkType: hard
@@ -7093,9 +7093,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/wmconnect-mini-app@npm:3.1.1-alpha.0":
- version: 3.1.1-alpha.0
- resolution: "@walmart/wmconnect-mini-app@npm:3.1.1-alpha.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-3.1.1-alpha.0.tgz"
+"@walmart/wmconnect-mini-app@npm:3.2.0-alpha.5":
+ version: 3.2.0-alpha.5
+ resolution: "@walmart/wmconnect-mini-app@npm:3.2.0-alpha.5::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-3.2.0-alpha.5.tgz"
peerDependencies:
"@walmart/allspark-foundation": ">=6.32.0"
expo: ~52.0.46
@@ -7106,7 +7106,7 @@ __metadata:
dependenciesMeta:
"@walmart/me-at-walmart":
built: false
- checksum: 10c0/6bcdbe8031f2b1b43262741ad10d138faa20bc3a666ead35d3474b9aa166703b2bd03bb7526ac9b8352f920592d0121507a8dfd4ceb66b43ef3f0ab935e559f5
+ checksum: 10c0/d1d534d8a7e49d84eb3b1b003ffe573d9dab2c3c0b8ba1393dbc604012ac7bcf6b0650f2e968a92900ab452a7b706f89e02d72d0007b9750b9a31d7faa04edfa
languageName: node
linkType: hard
| feat(ui): update myteam mini app | feat(ui): update myteam mini app
|
b8bb80881409bced4d182aae17da427f3267e9f3 | --- packages/allspark-foundation/src/Components/ComponentContainers.md
@@ -38,11 +38,11 @@ Or with `AllsparkComponentContainers`:
<AllsparkComponentContainers.List container='Me@Walmart.HomeScreen' {...props} />
```
-##### List Control
+##### Render some components
-The `List` component accepts an optional `allow` prop to control which components are rendered and in what order.
+The `List` component accepts an optional `allow` prop to control which components are rendered.
-- `allow` - A list of component ids to allow. If provided, only components with ids in this list will be rendered. And they will be rendered in the order they are provided.
+- `allow` - A list of component ids to allow. If provided, only components with ids in this list will be rendered.
```tsx
const ALLOW_LIST = ['emergency-card', ...];
--- packages/allspark-foundation/src/Components/ComponentContainers.tsx
@@ -3,16 +3,13 @@ import {
EventManager,
useRenderOnChange,
DynamicQueue,
+ AnyObject,
} from '@walmart/allspark-utils';
type ComponentContainerListConfig = {
allow?: string[];
};
-type ComponentContainerProps = {
- [key: string]: any;
-};
-
/**
* A component container manages a set of components with a given set of props.
*
@@ -35,7 +32,7 @@ type ComponentContainerProps = {
* // Render component2
* <MyContainer.Component id="component2" greeting='Hello' />
*/
-export class ComponentContainer<Props extends ComponentContainerProps> {
+export class ComponentContainer<Props extends AnyObject> {
private _components = new Map<string, ComponentType<Props>>();
private _eventManager = new EventManager<{
change: string;
@@ -97,7 +94,7 @@ export class ComponentContainer<Props extends ComponentContainerProps> {
* @param props.id - The ID of the component to render.
* @param props - Props to pass to the component.
* @example
- * <AllsparkElementContainer.Component id="component-1" {...props} />
+ * <ComponentContainer.Component id="component-1" {...props} />
*/
public Component = (props: { id: string } & Props) => {
const { id, ...rest } = props;
@@ -116,7 +113,7 @@ export class ComponentContainer<Props extends ComponentContainerProps> {
* Renders all components added to the container with the given props
* @param props - Props to pass to the components.
* @example
- * <AllsparkElementContainer.Container {...props} />
+ * <ComponentContainer.Container {...props} />
*/
public List = (props: Props & ComponentContainerListConfig) => {
const { allow, ...restProps } = props;
@@ -168,9 +165,7 @@ export class ComponentContainer<Props extends ComponentContainerProps> {
* // Hello Component 1
* // Hello Component 2
*/
-class ComponentContainerManager<
- Containers extends Record<string, ComponentContainerProps>
-> {
+class ComponentContainerManager<Containers extends Record<string, AnyObject>> {
private _containers = {} as {
[K in keyof Containers]: ComponentContainer<Containers[K]>;
};
@@ -223,9 +218,9 @@ class ComponentContainerManager<
*
* @example
* // Create Container
- * const MyContainer = AllsparkElementContainers.createContainer('MyContainer');
+ * const MyContainer = AllsparkComponentContainers.createContainer('MyContainer');
*
- * // Use Element
+ * // Use Component
* <MyContainer.Container {...props} />
*/
public create = <K extends keyof Containers>(containerId: K) => {
@@ -239,7 +234,7 @@ class ComponentContainerManager<
* Renders container component for a given container ID.
* @param props.container - The ID of the container to render.
* @example
- * <AllsparkElementContainers.Container container="MyContainer" {...props} />
+ * <AllsparkComponentContainers.Container container="MyContainer" {...props} />
*/
public List = <K extends keyof Containers>(
props: { container: K } & Containers[K] & ComponentContainerListConfig
@@ -256,7 +251,7 @@ class ComponentContainerManager<
* @param props.container - The ID of the container to render.
* @param props.id - The ID of the component to render.
* @example
- * <AllsparkElementContainers.Component container="MyContainer" id="component1" {...props} />
+ * <AllsparkComponentContainers.Component container="MyContainer" id="component1" {...props} />
*/
public Component = <K extends keyof Containers>(
props: { container: K; id: string } & Containers[K]
@@ -276,7 +271,7 @@ class ComponentContainerManager<
* @param component - The component to add.
* @example
* // Add component-1 to MyContainer.
- * AllsparkElementContainers.add('MyContainer', 'component-1', (props) => <Text>Component 1</Text>)
+ * AllsparkComponentContainers.add('MyContainer', 'component-1', (props) => <Text>Component 1</Text>)
*/
public add = <K extends keyof Containers>(
containerId: K,
@@ -295,7 +290,7 @@ class ComponentContainerManager<
* @param containerId - The ID of the ComponentContainer instance to add the record to.
* @param components - An array of [id, Component] tuples to add.
* @example
- * AllsparkElementContainers.addMultiple('MyContainer', [
+ * AllsparkComponentContainers.addMultiple('MyContainer', [
* ['component1', Component1],
* ['component2', Component2],
* ]);
@@ -318,7 +313,7 @@ class ComponentContainerManager<
* @param id - The ID of the component to remove.
* @example
* // Remove component-1 from MyContainer.
- * AllsparkElementContainers.remove('MyContainer', 'component-1')
+ * AllsparkComponentContainers.remove('MyContainer', 'component-1')
*/
public remove = <K extends keyof Containers>(containerId: K, id: string) => {
if (this._containers[containerId]) {
| chore: fix component container docs and comments | chore: fix component container docs and comments
|
b69f2d22281400ccc25e17993419816cde791418 | --- core/__tests__/settings/__snapshots__/LanguageSettingsTest.tsx.snap
@@ -28,6 +28,7 @@ exports[`LanguageSettings 1`] = `
"marginBottom": 16,
}
}
+ accessibilityLabel="English (EN) Radio"
checked={true}
label="English (EN)"
onPress={[Function]}
@@ -39,6 +40,7 @@ exports[`LanguageSettings 1`] = `
"marginBottom": 16,
}
}
+ accessibilityLabel="Español (ES) Radio"
checked={false}
label="Español (ES)"
onPress={[Function]}
--- core/__tests__/settings/__snapshots__/SettingsHomeTest.tsx.snap
@@ -2,6 +2,7 @@
exports[`SettingItem 1`] = `
<View
+ accessibilityRole="button"
accessibilityState={
{
"busy": undefined,
@@ -67,6 +68,7 @@ exports[`SettingItem 1`] = `
exports[`SettingItem with GTP Icon 1`] = `
<View
+ accessibilityRole="link"
accessibilityState={
{
"busy": undefined,
@@ -324,6 +326,7 @@ exports[`SettingsHome 1`] = `
style={null}
>
<View
+ accessibilityRole="button"
accessibilityState={
{
"busy": undefined,
@@ -412,6 +415,7 @@ exports[`SettingsHome 1`] = `
style={null}
>
<View
+ accessibilityRole="button"
accessibilityState={
{
"busy": undefined,
@@ -551,6 +555,7 @@ exports[`SettingsHome 1`] = `
style={null}
>
<View
+ accessibilityRole="link"
accessibilityState={
{
"busy": undefined,
@@ -636,6 +641,7 @@ exports[`SettingsHome 1`] = `
style={null}
>
<View
+ accessibilityRole="button"
accessibilityState={
{
"busy": undefined,
--- core/__tests__/settings/__snapshots__/ToggleSettingTest.tsx.snap
@@ -91,6 +91,7 @@ exports[`ToggleSetting renders correctly while setting is false 1`] = `
}
>
<Switch
+ accessibilityLabel="Turn On"
isOn={false}
onValueChange={[MockFunction]}
testID="undefined_switch"
@@ -147,6 +148,7 @@ exports[`ToggleSetting renders correctly while setting is true 1`] = `
}
>
<Switch
+ accessibilityLabel="Turn Off"
isOn={true}
onValueChange={[MockFunction]}
testID="undefined_switch"
@@ -212,6 +214,7 @@ exports[`ToggleSetting renders correctly with error 1`] = `
}
>
<Switch
+ accessibilityLabel="Turn On"
isOn={false}
onValueChange={[MockFunction]}
testID="undefined_switch"
@@ -273,6 +276,7 @@ exports[`ToggleSetting renders correctly with icon 1`] = `
}
>
<Switch
+ accessibilityLabel="Turn On"
isOn={false}
onValueChange={[MockFunction]}
testID="undefined_switch"
| chore: updating snapshots | chore: updating snapshots
|
cdcfd6a1837d9b9f97ef2bd29f87b93f98e611a8 | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/myteam-mini-app",
- "version": "1.15.1-alpha.2",
+ "version": "1.15.1-alpha.3",
"main": "dist/index.js",
"files": [
"dist"
@@ -99,9 +99,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.12.1-alpha.2",
+ "@walmart/roster-mini-app": "2.12.1-alpha.3",
"@walmart/ui-components": "1.15.1",
- "@walmart/wmconnect-mini-app": "2.8.0-alpha.3",
+ "@walmart/wmconnect-mini-app": "2.8.0-alpha.6",
"babel-jest": "^29.2.1",
"chance": "^1.1.11",
"eslint": "8.22.0",
--- yarn.lock
@@ -6400,9 +6400,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.12.1-alpha.2"
+ "@walmart/roster-mini-app": "npm:2.12.1-alpha.3"
"@walmart/ui-components": "npm:1.15.1"
- "@walmart/wmconnect-mini-app": "npm:2.8.0-alpha.3"
+ "@walmart/wmconnect-mini-app": "npm:2.8.0-alpha.6"
babel-jest: "npm:^29.2.1"
chance: "npm:^1.1.11"
eslint: "npm:8.22.0"
@@ -6582,9 +6582,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/roster-mini-app@npm:2.12.1-alpha.2":
- version: 2.12.1-alpha.2
- resolution: "@walmart/roster-mini-app@npm:2.12.1-alpha.2"
+"@walmart/roster-mini-app@npm:2.12.1-alpha.3":
+ version: 2.12.1-alpha.3
+ resolution: "@walmart/roster-mini-app@npm:2.12.1-alpha.3"
peerDependencies:
"@react-native-async-storage/async-storage": ^1.21.0
"@react-native-community/netinfo": ^11.0.1
@@ -6626,7 +6626,7 @@ __metadata:
redux: ^4.2.1
redux-saga: ^1.2.3
wifi-store-locator: 1.4.1
- checksum: 10c0/d233a0dd19912a3465695d9ae8f0700079ab39811b7cb49e6cc3d12fe23a63c0a30505edd49feb8a89789c4e262c126ec7db76b31c06f1d479f9fb2ba467477f
+ checksum: 10c0/b9d7e6ab0524babea8973895c65959d74e3847d34089bf08e65264d3289f2e5ccc69720abfbd6bed004ce7da663f06b835dba2cd7a34cc1f05a262d3a7bd5931
languageName: node
linkType: hard
@@ -6650,9 +6650,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/wmconnect-mini-app@npm:2.8.0-alpha.3":
- version: 2.8.0-alpha.3
- resolution: "@walmart/wmconnect-mini-app@npm:2.8.0-alpha.3"
+"@walmart/wmconnect-mini-app@npm:2.8.0-alpha.6":
+ version: 2.8.0-alpha.6
+ resolution: "@walmart/wmconnect-mini-app@npm:2.8.0-alpha.6"
peerDependencies:
"@react-native-async-storage/async-storage": ^1.21.0
"@react-native-community/netinfo": ^11.0.1
@@ -6692,7 +6692,7 @@ __metadata:
redux: ^4.2.1
redux-saga: ^1.2.3
wifi-store-locator: 1.4.1
- checksum: 10c0/0d9d8fd2e96c135e23196af1db4e408cb879ffb265536ed69de053cebfbd816da65d813dc2c318d21edef32ffc0eeeaa51bacd4b26b2942891cff788275d924b
+ checksum: 10c0/e03fc87a25ffa31e45cac58e6898175f7296fef0667b24c2bb94fe6aae59cd729ff8c42592473deb51d68c4412f0efba2c66d87b7a63a406bf4c005e7ac3d257
languageName: node
linkType: hard
| update the shared files | update the shared files
|
4704df77bb32dccc978b4544a43f09c8dd4474b3 | --- packages/my-walmart-hub/src/Shared/Hooks/useGetViewersPrimaryTeam.ts
@@ -103,7 +103,10 @@ import {
TOTAL_STORE_TEAM_ID,
TOTAL_STORE_TEAM_LABEL,
} from '../Constants/teams';
-import { SiteSelectors } from '@walmart/allspark-foundation';
+import {
+ SiteSelectors,
+ useAllsparkSelector,
+} from '@walmart/allspark-foundation';
// ================================
// TYPE DEFINITIONS
@@ -218,9 +221,12 @@ export const useGetViewersPrimaryTeam = (): TeamInfo[] => {
*/
const viewerTeam: Team[] | undefined = useSelector(UserSelectors.getTeams);
- const userDomain: string | undefined = useSelector(UserSelectors.getDomain);
- const isHomeOffice: boolean =
- userDomain?.toLowerCase() === HOME_OFFICE_DOMAIN;
+ const userDomain: string | undefined = useSelector(UserSelectors.getDomain);
+ const isHomeOffice: boolean =
+ userDomain?.toLowerCase() === HOME_OFFICE_DOMAIN;
+
+ const workingSite = useAllsparkSelector(UserSelectors.getWorkingSite);
+ const homeSite = useAllsparkSelector(UserSelectors.getHomeSite);
/**
* User's salaried status
@@ -313,6 +319,13 @@ export const useGetViewersPrimaryTeam = (): TeamInfo[] => {
},
];
}
+ } else if (viewerTeam?.length && workingSite !== homeSite) {
+ return [
+ {
+ teamName: isSiteDC ? TOTAL_SITE_TEAM_LABEL : TOTAL_STORE_TEAM_LABEL,
+ teamId: isSiteDC ? TOTAL_SITE_TEAM_ID : TOTAL_STORE_TEAM_ID,
+ },
+ ];
}
// ================================
| feat(ui): useGetViewersPrimaryTeam bug fix (#527) | feat(ui): useGetViewersPrimaryTeam bug fix (#527)
* feat(ui): added condition to check if the site has changed and return total team
* feat(ui): added null check
---------
Co-authored-by: Prasan Suresh Dhareshwar - p0d02sx <Prasansuresh.Dharesh@walmart.com> |
14d5a28266b448fafb3d4541e2172656ebb6288d | --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Components/ActionButtonGroup/ActionButtonGroup.tsx
@@ -12,7 +12,13 @@ export const ActionButtonGroup = ({
}: ButtonGroupProps) => {
return (
<View style={styles.buttonContainer}>
- <Button variant='tertiary' size='small' onPress={onNegativeButtonPress}>
+ <Button
+ variant='tertiary'
+ size='small'
+ onPress={onNegativeButtonPress}
+ accessibilityRole='button'
+ accessibilityLabel={negativeButtonLabel}
+ >
{negativeButtonLabel}
</Button>
<View style={styles.positiveButtonContainer}>
@@ -21,6 +27,8 @@ export const ActionButtonGroup = ({
size='medium'
isFullWidth
onPress={onPositiveButtonPress}
+ accessibilityRole='button'
+ accessibilityLabel={positiveButtonLabel}
>
{positiveButtonLabel}
</Button>
| feat: added accessibility | feat: added accessibility
|
e5542ab1d7691c4039057bccbe5e731c4f276780 | --- __tests__/navigation/AssociateHallwayNav/__snapshots__/SideMenuContentTest.tsx.snap
@@ -35,7 +35,7 @@ exports[`SideMenuContent matches snapshot for undefined user info, and can imper
},
]
}
- loading={true}
+ loading={false}
loadingText="menu.loadingText"
locale="en-US"
nameInitials="SW"
@@ -195,7 +195,7 @@ exports[`SideMenuContent matches snapshot with user/clockstatus data 1`] = `
},
]
}
- loading={true}
+ loading={false}
loadingText="menu.loadingText"
locale="en-US"
nameInitials="SW"
| test case update | test case update
(cherry picked from commit 3aa7a601c6405a6f6db8d580d00d840acac11174)
|
d66d8254c372f8c402a55e8253f4a4735913648b | --- __tests__/core/initSSOTest.ts
@@ -72,11 +72,9 @@ describe('ssoTelemetryEventListener', () => {
ssoTelemetryEventListener(event);
- expect(WmTelemetry.logEvent).toHaveBeenCalledWith(
- SSO_APP,
- 'successful',
- {},
- );
+ expect(WmTelemetry.logEvent).toHaveBeenCalledWith(SSO_APP, 'successful', {
+ isPreHire: 'false',
+ });
expect(logger.info).toHaveBeenCalledWith('User sign in succeeded', {});
});
@@ -87,11 +85,9 @@ describe('ssoTelemetryEventListener', () => {
ssoTelemetryEventListener(event);
- expect(WmTelemetry.logEvent).toHaveBeenCalledWith(
- SSO_APP,
- 'successful',
- {},
- );
+ expect(WmTelemetry.logEvent).toHaveBeenCalledWith(SSO_APP, 'successful', {
+ isPreHire: 'false',
+ });
expect(logger.info).toHaveBeenCalledWith('User change succeeded', {});
});
});
--- src/core/initSSO.ts
@@ -8,6 +8,8 @@ import WmTelemetry from 'react-native-wm-telemetry';
import {SSO_APP} from '../types/telemetryConstants';
import {logger} from '../services/Logger';
+export const PRE_HIRE_USER_TYPE = 'PRE_HIRE';
+
export const ssoTelemetryEventListener = (event: SSOPingFedEventData) => {
switch (event.action) {
case SSOPingFedEvents.types.error:
@@ -23,11 +25,15 @@ export const ssoTelemetryEventListener = (event: SSOPingFedEventData) => {
logger.info('Sign out event from SSO', {});
break;
case SSOPingFedEvents.types.authSuccess:
- WmTelemetry.logEvent(SSO_APP, 'successful', {});
+ WmTelemetry.logEvent(SSO_APP, 'successful', {
+ isPreHire: String(event.userType === PRE_HIRE_USER_TYPE),
+ });
logger.info('User sign in succeeded', {});
break;
case SSOPingFedEvents.types.userChanged:
- WmTelemetry.logEvent(SSO_APP, 'successful', {});
+ WmTelemetry.logEvent(SSO_APP, 'successful', {
+ isPreHire: String(event.userType === PRE_HIRE_USER_TYPE),
+ });
logger.info('User change succeeded', {});
break;
}
| adding pre hire info to successful event | adding pre hire info to successful event
|
bdc1670a3d656d8b16e14f04bdf489fe203474f5 | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/roster-mini-app",
- "version": "2.17.0",
+ "version": "2.18.0",
"main": "dist/index.js",
"files": [
"dist"
--- src/screens/index.tsx
@@ -1,20 +1,11 @@
-import React from 'react';
import {ScreenTags} from '@walmart/me-at-walmart-common';
import {RosterFeature} from '../common/feature';
import {RosterNavParamsMap, RosterNavigation} from '../navigation';
// import {AllTeamsScreen} from './AllTeamsScreen';
// import {RosterDetailScreen} from './RosterDetailScreen';
-export const RosterMiniApp = () => {
- return (
- <>
- <RosterNavigation />
- </>
- );
-};
-
const rosterScreens = RosterFeature.createScreen<RosterNavParamsMap, 'myTeam'>(
- RosterMiniApp,
+ RosterNavigation,
{
tags: [ScreenTags.MyTeamTab],
clockCheckRequired: true,
| Update the roster mini app version | Update the roster mini app version
|
da5461db870781aef4bcb9c5879ee1ca7e27abb9 | --- src/components/Roster/Roster.tsx
@@ -30,6 +30,8 @@ import {UserSelectors} from '@walmart/redux-store';
import {useSafeAreaInsets} from 'react-native-safe-area-context';
import {FilterValue, RosterFilters} from '../../containers/RosterFilters';
import {ListEmptyComponent} from './ListEmptyComponent';
+import {RosterHeader} from '../RosterHeader';
+import {TeamChatCard} from '../TeamList';
//TODO: States to verify: No Data, Loading, Error (identify all types of errors), Success
export const Roster: React.FC<RosterProps> = (props) => {
@@ -73,6 +75,12 @@ export const Roster: React.FC<RosterProps> = (props) => {
setAssociates(sortedAssociateList(filteredAssociates, teamLeads));
};
+ const handleScrollToTop = () => {
+ if (flashListRef.current) {
+ flashListRef.current.scrollToIndex({index: 0});
+ }
+ };
+
const onRefreshHandler = useCallback(async () => {
setIsRefreshing(true);
if (!shouldSkipQuery) {
@@ -164,6 +172,11 @@ export const Roster: React.FC<RosterProps> = (props) => {
})}
</Alert>
)}
+ <TeamChatCard
+ style={styles.teamCard}
+ scrollToTop={handleScrollToTop}
+ />
+ {!!associates.length && <RosterHeader associates={associates} />}
</>
}
ListEmptyComponent={
--- src/components/RosterHeader.tsx
@@ -6,6 +6,7 @@ import {goToWeeklySchedule} from '../navigation/utils';
import {ROSTER_I18N_NAMESPACE} from '../translations';
import {useTranslation} from 'react-i18next';
import {useRbacConfigWithJobCode, useSiteTranslationContext} from '../hooks';
+import { AssociateRosterItem } from "./Roster/types";
const styles = StyleSheet.create({
rosterHeader: {
@@ -23,7 +24,7 @@ const styles = StyleSheet.create({
export type RosterHeaderProps = {
teamName?: string;
- associates: Associate[];
+ associates: AssociateRosterItem[];
};
export const RosterHeader = (props: RosterHeaderProps) => {
| updating roster | updating roster
|
dd6e973f08a492fafd57d96a93b07d57d97bc82a | --- package.json
@@ -89,7 +89,7 @@
"@walmart/allspark-utils": "7.1.0",
"@walmart/amp-mini-app": "1.2.10",
"@walmart/ask-sam-chat-components": "^0.2.7",
- "@walmart/ask-sam-mini-app": "1.33.101",
+ "@walmart/ask-sam-mini-app": "1.35.11",
"@walmart/associate-exp-hub-hub": "2.13.3",
"@walmart/associate-exp-hub-team-switcher": "2.15.0",
"@walmart/associate-listening-mini-app": "1.2.39",
--- yarn.lock
@@ -7297,9 +7297,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/ask-sam-mini-app@npm:1.33.101":
- version: 1.33.101
- resolution: "@walmart/ask-sam-mini-app@npm:1.33.101::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fask-sam-mini-app%2F-%2F%40walmart%2Fask-sam-mini-app-1.33.101.tgz"
+"@walmart/ask-sam-mini-app@npm:1.35.11":
+ version: 1.35.11
+ resolution: "@walmart/ask-sam-mini-app@npm:1.35.11::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fask-sam-mini-app%2F-%2F%40walmart%2Fask-sam-mini-app-1.35.11.tgz"
dependencies:
apisauce: "npm:^1.1.2"
numeral: "npm:^2.0.6"
@@ -7318,8 +7318,8 @@ __metadata:
"@walmart/wfm-ui": "*"
axios: ">=1.2.6"
expo: 50.0.17
- expo-av: ">=13.10.6"
expo-linear-gradient: ">=12.7.2"
+ expo-video: ">=1.0.0"
lodash: ">=4.17"
moment: ">=2.26"
react: ">=18.2.0"
@@ -7336,13 +7336,12 @@ __metadata:
react-native-tab-view: ">=3.3"
react-native-typing-animation: ">=0.1"
react-native-vector-icons: ">=9"
- react-native-video: ">=5.2"
react-native-view-shot: ">=3.4"
react-native-webview: ">=13.2"
react-native-wm-voice-text: ">=0.3"
reselect: ">=4"
victory-native: ">=36.5"
- checksum: 10c0/26f0cc083aca70b41bf50b4dcb2711c817d232701faa9f6e6cc1e406ac0163a430a7f5dfa386f517c96b88924d29307b94f41969a2f5bbba74496fd7a5e82bff
+ checksum: 10c0/7638a6eb1c0099a5045aecf13ec8919f6af06a02d1cce1b353d49942a68eb05a55f15476313124971433be7fe5b297a264bcf278ba1256961220a0b09a529da4
languageName: node
linkType: hard
@@ -8511,7 +8510,7 @@ __metadata:
"@walmart/allspark-utils": "npm:7.1.0"
"@walmart/amp-mini-app": "npm:1.2.10"
"@walmart/ask-sam-chat-components": "npm:^0.2.7"
- "@walmart/ask-sam-mini-app": "npm:1.33.101"
+ "@walmart/ask-sam-mini-app": "npm:1.35.11"
"@walmart/associate-exp-hub-hub": "npm:2.13.3"
"@walmart/associate-exp-hub-team-switcher": "npm:2.15.0"
"@walmart/associate-listening-mini-app": "npm:1.2.39"
| fix(asksam): SMBLV-9263: adress sonar, remove dep libraries, FAB (#4998) | fix(asksam): SMBLV-9263: adress sonar, remove dep libraries, FAB (#4998)
Co-authored-by: j0z09av <j0z09av@homeoffice.wal-mart.com>
Co-authored-by: Sowmya Munaganuri <Sowmya.Munaganuri+walmart@walmart.com>
Co-authored-by: Sowmya Munaganuri <Sowmya.Munaganuri@walmart.com>
Co-authored-by: Pavan Lingamallu - p0l04ug <Pavan.Lingamallu@walmart.com>
Co-authored-by: Yarien Mendez Suarez - y0m07dz <Yarien.Mendez.Suarez@walmart.com> |
653114ab3601abafe356b29c5777184a21e62e9a | --- src/components/Roster/types.ts
@@ -1,8 +1,8 @@
import {Associate, Team} from '../../types';
-export interface RosterActionButton {
+export interface RosterActionButton<T = any> {
i18nLabel: string;
- action: (event: any) => void; //TODO: Refactor this type, associateList item passes the associate obj. Teams might do something different
+ action: (data: T) => void; //TODO: Refactor this type, associateList item passes the associate obj. Teams might do something different
}
export interface RosterData {
| fixing type | fixing type
|
4422e705f385e4274addefbc5eb8827ae08fc072 | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/myteam-mini-app",
- "version": "1.19.0",
+ "version": "1.20.0",
"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.16",
+ "@walmart/allspark-foundation-hub": "1.2.19",
"@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.15.0",
+ "@walmart/roster-mini-app": "2.16.0",
"@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.16":
- version: 1.2.16
- resolution: "@walmart/allspark-foundation-hub@npm:1.2.16"
+"@walmart/allspark-foundation-hub@npm:1.2.19":
+ version: 1.2.19
+ resolution: "@walmart/allspark-foundation-hub@npm:1.2.19"
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/7a7cdf90628b381f3321cc8a918ee24b15a0cc55f0ce8b90a3955067f0cb57e75c19ec7e859b2f951b1be8925528c3911ef26d1c2bb90c02716adece0e80d72e
+ checksum: 10c0/5264b54a010b6c2096d9a17b23c9b2c7e43a89ad8b8b157a31a939b71b9084f70bd2beeabffad6c14ee92eb6ae5165960fd9febaffc9e0347c3e6a25513052ec
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.16"
+ "@walmart/allspark-foundation-hub": "npm:1.2.19"
"@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.15.0"
+ "@walmart/roster-mini-app": "npm:2.16.0"
"@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.15.0":
- version: 2.15.0
- resolution: "@walmart/roster-mini-app@npm:2.15.0"
+"@walmart/roster-mini-app@npm:2.16.0":
+ version: 2.16.0
+ resolution: "@walmart/roster-mini-app@npm:2.16.0"
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/10739658d4d8141a6f22c54993b69e400b2cdf0377027c4ac4bdb1d914e0f596a845782783fa02fac35e53a6334672003e47148a14079d6144197f02cffc3776
+ checksum: 10c0/f2b2c442e69c175df15b029f298f928a60d12ea65ef7dc81187df1799c26a3d7175ef61865047442baaf64a6d8814ebbc99a0f019bc63fda3b6baa2d47a9b1af
languageName: node
linkType: hard
| Update my team mini app version | Update my team mini app version
|
9c77f37168e929e9d543c1f39c3cdf745ac0278e | --- package.json
@@ -89,7 +89,7 @@
"@walmart/attendance-mini-app": "3.44.0",
"@walmart/avp-feature-app": "0.5.1",
"@walmart/avp-shared-library": "0.5.2",
- "@walmart/backroom-mini-app": "1.0.9",
+ "@walmart/backroom-mini-app": "1.1.9",
"@walmart/calling-mini-app": "0.2.38",
"@walmart/checkout-mini-app": " 3.15.39",
"@walmart/compass-sdk-rn": "5.19.8",
--- yarn.lock
@@ -5731,9 +5731,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/backroom-mini-app@npm:1.0.9":
- version: 1.0.9
- resolution: "@walmart/backroom-mini-app@npm:1.0.9"
+"@walmart/backroom-mini-app@npm:1.1.9":
+ version: 1.1.9
+ resolution: "@walmart/backroom-mini-app@npm:1.1.9"
dependencies:
pubsub-js: "npm:^1.9.4"
react-native-mask-input: "npm:^1.2.3"
@@ -5741,10 +5741,11 @@ __metadata:
"@react-navigation/native": ^6.0.0
"@react-navigation/stack": ^6.1.0
"@walmart/gtp-shared-components": ">=1.8.0"
+ "@walmart/react-native-scanner-3.0": ">=0.6.0"
axios: ">=0.26.1"
react: "*"
react-native: "*"
- react-native-flipper: ">=0.182.0"
+ react-native-flipper: ">=0.212.0"
react-native-gesture-handler: ">=2.9.0"
react-native-new-snap-carousel: ">=3.9.3"
react-native-reanimated: ">=2.14.4"
@@ -5754,7 +5755,7 @@ __metadata:
react-native-svg-transformer: ">=1.0.0"
react-redux: ^8.0.0
redux: ^4.0.0
- checksum: 10c0/61dfec4f357e88dc42c2a108beb34fe088f2ccf57539c3a4b3629e436692ef2ac896799d182b6f2bc6b728ee508b34150e52263f27a6df8953aa9396a62cdb2c
+ checksum: 10c0/9d4af460931d78d12cc1d7d6df6d611d3ecd4bf874ed83da6deb48da9eee5b2d6aa05af5993c1ffa8b7ae3f0fb1d36a5e94112ea6671c9ebedc7baa8888e2172
languageName: node
linkType: hard
@@ -7803,7 +7804,7 @@ __metadata:
"@walmart/attendance-mini-app": "npm:3.44.0"
"@walmart/avp-feature-app": "npm:0.5.1"
"@walmart/avp-shared-library": "npm:0.5.2"
- "@walmart/backroom-mini-app": "npm:1.0.9"
+ "@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/compass-sdk-rn": "npm:5.19.8"
| Update @walmart/backroom-mini-app to 1.1.9 | Update @walmart/backroom-mini-app to 1.1.9
|
78036da2dde2fbd9156d42b3e46684775c698bf6 | --- .looper.yml
@@ -45,7 +45,7 @@ flows:
publishFromChanges:
- call: preparePublish
- - (name Publish From Changes) HUSKY_SKIP_HOOKS=1 npx lerna publish --yes
+ - (name Publish From Changes) HUSKY_SKIP_HOOKS=1 npx lerna publish --yes --force-publish
publishAll:
- call: preparePublish
| chore: update looper for temporary major publish flow | chore: update looper for temporary major publish flow
|
a2f882e13292886709d5ced770b61b7b2b842b1f | --- packages/allspark-foundation-hub/__tests__/HubContainer.test.tsx
@@ -565,7 +565,7 @@ jest.mock('@walmart/allspark-foundation', () => ({
},
}));
-jest.mock('../src/Store/Hub/Container', () => 'HubDashboard');
+jest.mock('../src/Store/Modules/Hub', () => 'HubDashboard');
jest.mock('../src/AllsparkHubContainer', () => ({
...jest.requireActual('../src/AllsparkHubContainer'),
--- packages/allspark-foundation-hub/__tests__/supplyChain/PageHeader.test.tsx
@@ -1,7 +1,7 @@
jest.useFakeTimers();
import React from 'react';
import { render } from '@walmart/allspark-foundation/__tests__/utils';
-import { RosterPageHeader, RosterHeaderProps } from '../../src/SupplyChain';
+import { RosterPageHeader, RosterHeaderProps } from '../../src/Shared';
describe('RosterPageHeader', () => {
afterEach(() => {
--- packages/allspark-foundation-hub/src/Shared/Components/PageHeader/PageHeader.tsx
@@ -1,17 +1,16 @@
import React, { useMemo } from 'react';
-import { Text, View } from 'react-native';
+import { Text, TouchableOpacity, View } from 'react-native';
import {
Heading,
Link,
ChevronRightIcon,
} from '@walmart/gtp-shared-components';
import { useAllsparkImage } from '@walmart/allspark-foundation/Components/context';
-import { TouchableOpacity } from 'react-native-gesture-handler';
-import { RosterHeaderProps, getHeaderStyles } from '.';
import { useSelector } from 'react-redux';
import { teamImageEnabled } from '../../../SupplyChain/Redux';
-
-export const RosterPageHeader = ({
+import PageHeaderProps from './types';
+import { getHeaderStyles } from '.';
+export const PageHeader = ({
title,
subText,
imageContent,
@@ -23,7 +22,7 @@ export const RosterPageHeader = ({
textLinkLabel = '',
backgroundColorOverride,
fontSize = 18,
-}: RosterHeaderProps) => {
+}: PageHeaderProps) => {
const showTeamImage = useSelector(teamImageEnabled);
const TeamImage = useAllsparkImage();
const styles = useMemo(
--- packages/allspark-foundation-hub/src/Shared/Components/PageHeader/types.ts
@@ -6,7 +6,7 @@ export interface RightPanelConfig {
textLinkLabel?: string;
}
-export default interface RosterHeaderProps extends RightPanelConfig {
+export default interface PageHeaderProps extends RightPanelConfig {
title: string;
subText?: string;
imageContent?: { uri: string; blurhash: string };
| Update tests | Update tests
|
27ad7f4beaa1a4142766014e0bb27b02d2c45ae6 | --- packages/associate-exp-hub-mini-app/CHANGELOG.md
@@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# [1.4.0-alpha.22](https://gecgithub01.walmart.com/smdv/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-mini-app@1.4.0-alpha.21...@walmart/associate-exp-hub-mini-app@1.4.0-alpha.22) (2025-10-03)
+
+### Features
+
+- **ui:** updated redux to include work filter changes ([aeeb75f](https://gecgithub01.walmart.com/smdv/associate-exp-hub-mini-app/commit/aeeb75fc87c91dd131efd36f4394a221ea3ed265))
+
# [1.4.0-alpha.21](https://gecgithub01.walmart.com/smdv/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-mini-app@1.4.0-alpha.20...@walmart/associate-exp-hub-mini-app@1.4.0-alpha.21) (2025-09-09)
### Features
--- packages/associate-exp-hub-mini-app/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/associate-exp-hub-mini-app",
- "version": "1.4.0-alpha.21",
+ "version": "1.4.0-alpha.22",
"packageManager": "yarn@4.6.0",
"engines": {
"node": ">=18"
| chore(version): updating package version | chore(version): updating package version
- @walmart/associate-exp-hub-mini-app@1.4.0-alpha.22
|
d8070b00bca9b510cfd946bd1fb9d8431f1052a6 | --- __tests__/core/storeConfigInitTest.ts
@@ -97,9 +97,6 @@ describe('updateWorkingSiteInfo', () => {
select(SiteSelectors.getUserWorkingSite),
);
expect(iterator.next(undefined).value).toEqual(
- select(SiteSelectors.getUserSite),
- );
- expect(iterator.next('100').value).toEqual(
select(SiteSelectors.getSiteConfigData),
);
expect(iterator.next({siteId: 100}).done).toEqual(true);
@@ -110,9 +107,6 @@ describe('updateWorkingSiteInfo', () => {
expect(iterator.next().value).toEqual(
select(SiteSelectors.getUserWorkingSite),
);
- expect(iterator.next('100').value).toEqual(
- select(SiteSelectors.getUserSite),
- );
expect(iterator.next('100').value).toEqual(
select(SiteSelectors.getSiteConfigData),
);
@@ -125,9 +119,6 @@ describe('updateWorkingSiteInfo', () => {
expect(iterator.next().value).toEqual(
select(SiteSelectors.getUserWorkingSite),
);
- expect(iterator.next('100').value).toEqual(
- select(SiteSelectors.getUserSite),
- );
expect(iterator.next('100').value).toEqual(
select(SiteSelectors.getSiteConfigData),
);
@@ -147,9 +138,6 @@ describe('updateWorkingSiteInfo', () => {
expect(iterator.next().value).toEqual(
select(SiteSelectors.getUserWorkingSite),
);
- expect(iterator.next('100').value).toEqual(
- select(SiteSelectors.getUserSite),
- );
expect(iterator.next('100').value).toEqual(
select(SiteSelectors.getSiteConfigData),
);
--- src/core/storeConfigInit.ts
@@ -43,17 +43,18 @@ export function* updateHomeSiteInfo() {
// updating siteId. So checking it as fallback if workingSite is undefined.
export function* updateWorkingSiteInfo() {
const workingSite: string = yield select(SiteSelectors.getUserWorkingSite);
- const siteId: string = yield select(SiteSelectors.getUserSite);
- const site = workingSite || siteId;
const currentWorkingSiteInfo: Site | null = yield select(
SiteSelectors.getSiteConfigData,
);
- if (!!site && currentWorkingSiteInfo?.siteId !== +site) {
+ if (!!workingSite && currentWorkingSiteInfo?.siteId !== +workingSite) {
yield call(storeConfigActions.storeConfigProgress);
try {
- const workingSiteInfo: Site = yield call(StoreConfig.get, `${site}`);
+ const workingSiteInfo: Site = yield call(
+ StoreConfig.get,
+ `${workingSite}`,
+ );
yield call(storeConfigActions.storeConfigSuccess, workingSiteInfo);
} catch (error) {
logger?.error('Error while fetching working site info', {
| Removing store config site fallback logic as selector handles it already | Removing store config site fallback logic as selector handles it already
|
2846e458bde8c133c4475060e2e3a0e773547e7f | --- src/navigation/AssociateHallwayNav/MainStackNav.tsx
@@ -42,6 +42,7 @@ import {StoreInfoModal} from '../../storeInfo/StoreInfoModal';
//--- Main Stack --- //
const MainStack = createStackNavigator();
+const ClockOutGuardedTaskItQuickAction = withClockOutGuard(TaskItQuickActions);
const WorkMiniApps = [
{
@@ -173,7 +174,7 @@ export const MainStackNav = () => {
/>
<MainStack.Screen
name='taskItQuickActions'
- component={TaskItQuickActions}
+ component={ClockOutGuardedTaskItQuickAction}
options={{
gestureEnabled: true,
gestureDirection: 'vertical',
--- src/navigation/AssociateHallwayNav/Tabs/index.tsx
@@ -32,10 +32,13 @@ import {getValueForCurrentLanguage} from '../../../transforms/language';
import {BottomTabNav} from '../../../navConfig/types';
import {Images} from '../../../images';
import styles from './styles';
+import {withClockOutGuard} from '../../ClockOutGuard';
// --- Ask Sam "Fake" tab handling --- //
export const AskSamPlaceholder = () => <View />;
+const ClockOutGuardedTaskitMiniapp = withClockOutGuard(TaskItMiniApp);
+
export const onAskSamTabPress = (e: EventArg<'tabPress', true, undefined>) => {
e.preventDefault();
navigate('askSam');
@@ -204,7 +207,7 @@ export const MainTabsNav = () => {
{taskit.enabled ? (
<MainTabs.Screen
name='taskit'
- component={TaskItMiniApp}
+ component={ClockOutGuardedTaskitMiniapp}
options={{
tabBarIcon: renderTabBarIcon.bind({
icon: 'inactive-task',
| Added clockout guard for taskt it miniapp entry points | Added clockout guard for taskt it miniapp entry points
|
510608c714b7c32c8573cd6ffaa9a6a54aab55b5 | --- packages/allspark-foundation-hub/src/SupplyChain/Hooks/useSupplyChainShifts.tsx
@@ -14,7 +14,7 @@ export type SupplyChainShifts = {
export const useGetSupplyChainShifts = () => {
const [error, setError] = useState<any>(undefined);
-const [allShifts, setAllShifts] = useState<SupplyChainShifts[]>([]);
+ const [allShifts, setAllShifts] = useState<SupplyChainShifts[]>([]);
const logger = LoggerService.getContainerInstance();
const appVersion = useSelector(DeviceSelectors.getAppVersion);
const countryCode: string | undefined = useSelector(
| Fixing lint errors | Fixing lint errors
|
74917731ad3061e824c5a1ba8994cf6769606bb5 | --- package-lock.json
@@ -47,7 +47,7 @@
"@walmart/exception-mini-app": "1.2.4",
"@walmart/facilities-management-miniapp": "0.6.7",
"@walmart/feedback-all-spark-miniapp": "0.9.25",
- "@walmart/financial-wellbeing-feature-app": "1.6.2",
+ "@walmart/financial-wellbeing-feature-app": "1.6.3",
"@walmart/functional-components": "~4.0.3",
"@walmart/gta-react-native-calendars": "0.0.16",
"@walmart/gtp-shared-components": "2.0.4",
@@ -5199,9 +5199,9 @@
}
},
"node_modules/@walmart/financial-wellbeing-feature-app": {
- "version": "1.6.2",
- "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.6.2.tgz",
- "integrity": "sha512-xK+sf17pg+fcvEfLU7MKcXzzFyfGqdAAyZc4WJXwuEXAkigQo2WAw2MrSJKX6AhVlQsAZDUyCZQ69HMYZ2U9Ow==",
+ "version": "1.6.3",
+ "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.6.3.tgz",
+ "integrity": "sha512-2PGkGe/7YSPFNPogLpibjwZwmwKY7Yk+vwFjQoNNRSr3MJar7ncGTsqLxUtyYyND5/KO0CpAlnSjFAH+mcQmcA==",
"hasInstallScript": true,
"peerDependencies": {
"@react-navigation/native": "^6.0.0",
@@ -25117,9 +25117,9 @@
"integrity": "sha512-xSrJMEScMx3bC5AzGIBn7B1DhTmMPG6Wd3q4IREQjiTv5H37ezd7YWu5CkpHTAmezFOiFbaNvPmeNyIkQl+A+A=="
},
"@walmart/financial-wellbeing-feature-app": {
- "version": "1.6.2",
- "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.6.2.tgz",
- "integrity": "sha512-xK+sf17pg+fcvEfLU7MKcXzzFyfGqdAAyZc4WJXwuEXAkigQo2WAw2MrSJKX6AhVlQsAZDUyCZQ69HMYZ2U9Ow=="
+ "version": "1.6.3",
+ "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.6.3.tgz",
+ "integrity": "sha512-2PGkGe/7YSPFNPogLpibjwZwmwKY7Yk+vwFjQoNNRSr3MJar7ncGTsqLxUtyYyND5/KO0CpAlnSjFAH+mcQmcA=="
},
"@walmart/functional-components": {
"version": "4.0.3",
--- package.json
@@ -89,7 +89,7 @@
"@walmart/exception-mini-app": "1.2.4",
"@walmart/facilities-management-miniapp": "0.6.7",
"@walmart/feedback-all-spark-miniapp": "0.9.25",
- "@walmart/financial-wellbeing-feature-app": "1.6.2",
+ "@walmart/financial-wellbeing-feature-app": "1.6.3",
"@walmart/functional-components": "~4.0.3",
"@walmart/gta-react-native-calendars": "0.0.16",
"@walmart/gtp-shared-components": "2.0.4",
| bumped financial-wellbeing-feature-app to 1..6.3 | bumped financial-wellbeing-feature-app to 1..6.3
|
5d06a5080da46afeb0db72e78ca2078c142fd129 | --- yarn.lock
@@ -7868,7 +7868,7 @@ __metadata:
languageName: unknown
linkType: soft
-"@walmart/associate-exp-hub-hub@workspace:*, @walmart/associate-exp-hub-hub@workspace:packages/associate-exp-hub-hub":
+"@walmart/associate-exp-hub-hub@workspace:packages/associate-exp-hub-hub":
version: 0.0.0-use.local
resolution: "@walmart/associate-exp-hub-hub@workspace:packages/associate-exp-hub-hub"
dependencies:
@@ -7913,8 +7913,6 @@ __metadata:
"@testing-library/jest-native": "npm:5.4.3"
"@testing-library/react-hooks": "npm:^8.0.1"
"@testing-library/react-native": "npm:12.3.2"
- "@walmart/associate-exp-hub-hub": "workspace:*"
- "@walmart/associate-exp-hub-team-switcher": "workspace:*"
eslint: "npm:^8.19.0"
husky: "npm:^9.1.7"
jest: "npm:^29.6.3"
@@ -7977,7 +7975,7 @@ __metadata:
languageName: unknown
linkType: soft
-"@walmart/associate-exp-hub-team-switcher@workspace:*, @walmart/associate-exp-hub-team-switcher@workspace:packages/associate-exp-hub-team-switcher":
+"@walmart/associate-exp-hub-team-switcher@workspace:packages/associate-exp-hub-team-switcher":
version: 0.0.0-use.local
resolution: "@walmart/associate-exp-hub-team-switcher@workspace:packages/associate-exp-hub-team-switcher"
dependencies:
| feat(ui): update dependecncies | feat(ui): update dependecncies
|
2ebeff1a44e984e6cc43dd64441844b3971278d8 | --- package-lock.json
@@ -3515,11 +3515,6 @@
"resolved": "https://npme.walmart.com/@react-native-community/netinfo/-/netinfo-5.9.9.tgz",
"integrity": "sha512-Gp0XV4BgabvzkL4Dp6JAsA2l9LcmgBAq3erCLdvRZmEFz7guCWTogQWVfFtl+IbU0uqfwfo9fm2+mQiwdudLCw=="
},
- "@react-native-community/picker": {
- "version": "1.8.1",
- "resolved": "https://npme.walmart.com/@react-native-community/picker/-/picker-1.8.1.tgz",
- "integrity": "sha512-Sj9DzX1CSnmYiuEQ5fQhExoo4XjSKoZkqLPAAybycq6RHtCuWppf+eJXRMCOJki25BlKSSt+qVqg0fIe//ujNQ=="
- },
"@react-native-community/progress-bar-android": {
"version": "1.0.4",
"resolved": "https://npme.walmart.com/@react-native-community/progress-bar-android/-/progress-bar-android-1.0.4.tgz",
@@ -3577,6 +3572,11 @@
"resolved": "https://npme.walmart.com/@react-native-firebase/remote-config/-/remote-config-14.11.0.tgz",
"integrity": "sha512-yZ9fu3ckZ55t3nrtDnZ5ju60dzMuu24+xhrFHMnYBfc2jeUekwB6R3qXt9rurguT89XHCUOXWUtHvzZf+T14hA=="
},
+ "@react-native-picker/picker": {
+ "version": "2.4.1",
+ "resolved": "https://npme.walmart.com/@react-native-picker/picker/-/picker-2.4.1.tgz",
+ "integrity": "sha512-1XWy3IQgwr7MWd30KdY1iUh2gQZD+JiotN1ifj/ptFUYKon/0UFwngKQaWCO/CP/FdLl20/huSSLwKedYrdMMA=="
+ },
"@react-native/assets": {
"version": "1.0.0",
"resolved": "https://npme.walmart.com/@react-native/assets/-/assets-1.0.0.tgz",
--- package.json
@@ -54,7 +54,6 @@
"@react-native-community/hooks": "^2.6.0",
"@react-native-community/masked-view": "^0.1.10",
"@react-native-community/netinfo": "5.9.9",
- "@react-native-community/picker": "^1.8.1",
"@react-native-firebase/analytics": "14.11.0",
"@react-native-firebase/app": "14.11.0",
"@react-native-firebase/crashlytics": "14.11.0",
@@ -62,6 +61,7 @@
"@react-native-firebase/firestore": "14.11.0",
"@react-native-firebase/perf": "14.11.0",
"@react-native-firebase/remote-config": "14.11.0",
+ "@react-native-picker/picker": "^2.4.0",
"@react-navigation/bottom-tabs": "^6.2.0",
"@react-navigation/drawer": "^6.3.0",
"@react-navigation/material-top-tabs": "^6.1.0",
| removing react-native-community/picker | removing react-native-community/picker
|
9611b26560adb413750528abcce514693a087bef | --- yarn.lock
@@ -6696,24 +6696,21 @@ __metadata:
languageName: unknown
linkType: soft
-"@walmart/counts-component-miniapp@npm:0.1.15":
- version: 0.1.15
- resolution: "@walmart/counts-component-miniapp@npm:0.1.15"
+"@walmart/counts-component-miniapp@npm:0.2.1":
+ version: 0.2.1
+ resolution: "@walmart/counts-component-miniapp@npm:0.2.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fcounts-component-miniapp%2F-%2F%40walmart%2Fcounts-component-miniapp-0.2.1.tgz"
peerDependencies:
- "@react-navigation/native": ^6.0.8
- "@react-navigation/stack": ^6.2.0
+ "@react-navigation/native": ">=6.0.0"
+ "@react-navigation/stack": ">=6.2.0"
"@walmart/allspark-foundation": "*"
- "@walmart/gtp-shared-components": ^2.2.1
- react: ^18.2.0
+ "@walmart/allspark-utils": "*"
+ react: ">=18.2.0"
react-native: 0.73.7
- react-native-app-auth: ^6.4.3
- react-native-device-info: ^10.3.0
- react-native-permissions: ^3.10.1
+ react-native-device-info: ">=10.3.0"
+ react-native-permissions: ">=3.10.1"
react-native-webview: ^13.6.3
- react-native-wm-telemetry: 0.3.0
- react-redux: ^8.0.4
- reselect: ^4.1.0
- checksum: 10c0/cb49eb44c4ee006e48954b95147a0664a5afcc4a607b5f9ca4a18968c9931e755c96c8d7bd77936b1d3bfc58c272bc667627ee03157ec0d1b0ada1e9fa5556ba
+ reselect: ">=4.1.0"
+ checksum: 10c0/a7a0dd0df97af0a7f60e9b5dfcd885d69510faf8a20264bb741f2cd80ad1091fb24ffaec3abeb501097c9d62c05eade5b0b5546d092f5a10b6ff4100e21d36df
languageName: node
linkType: hard
@@ -7432,7 +7429,7 @@ __metadata:
"@walmart/core-services-allspark": "workspace:^"
"@walmart/core-utils": "npm:6.3.9"
"@walmart/core-widget-registry": "workspace:^"
- "@walmart/counts-component-miniapp": "npm:0.1.15"
+ "@walmart/counts-component-miniapp": "npm:0.2.1"
"@walmart/emergency-mini-app": "npm:1.30.5"
"@walmart/exception-mini-app": "npm:1.8.13"
"@walmart/facilities-management-miniapp": "npm:0.18.17"
@@ -7458,9 +7455,9 @@ __metadata:
"@walmart/myteam-mini-app": "npm:1.12.0"
"@walmart/native-rfid-scanner": "npm:3.12.1"
"@walmart/onewalmart-miniapp": "npm:1.0.24"
- "@walmart/pay-stub-miniapp": "npm:0.15.7"
- "@walmart/payrollsolution_miniapp": "npm:0.141.19"
- "@walmart/price-changes-mini-app": "npm:1.11.0"
+ "@walmart/pay-stub-miniapp": "npm:0.20.11"
+ "@walmart/payrollsolution_miniapp": "npm:0.145.31"
+ "@walmart/price-changes-mini-app": "npm:1.11.2"
"@walmart/profile-feature-app": "patch:@walmart/profile-feature-app@npm%3A1.138.3#~/.yarn/patches/@walmart-profile-feature-app-npm-1.138.3-9802440ed6.patch"
"@walmart/react-native-cookies": "npm:1.0.1"
"@walmart/react-native-encrypted-storage": "npm:~1.1.3"
@@ -7902,9 +7899,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/price-changes-mini-app@npm:1.11.0":
- version: 1.11.0
- resolution: "@walmart/price-changes-mini-app@npm:1.11.0"
+"@walmart/price-changes-mini-app@npm:1.11.2":
+ version: 1.11.2
+ resolution: "@walmart/price-changes-mini-app@npm:1.11.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fprice-changes-mini-app%2F-%2F%40walmart%2Fprice-changes-mini-app-1.11.2.tgz"
peerDependencies:
"@react-navigation/native": ">=6.0.0"
"@react-navigation/stack": ">=6.2.0"
@@ -7923,7 +7920,7 @@ __metadata:
redux-saga: ^1.1.3
reduxsauce: ^1.2.0
uuid: ^3.3.2
- checksum: 10c0/7db50762ca05de57ef9fe429a4d65b02bde4469a7a6bb03938ba6412e69bf736db4a406d1b82a0ef111823949d050464df80ac47b99256e9c88468f1b5a80702
+ checksum: 10c0/72992deda5382400e07e17108dfa58cac66ab330fc0d06952f6877bd1062f7ab0bc3b7af6276175101d470f9e85b9a4e8ff09c31327026b06013e6473b909af3
languageName: node
linkType: hard
| chore: resolving version conflict in yarn.lock | chore: resolving version conflict in yarn.lock
|
c8dbd66f8312491679e47a1fe2c295ffcb442506 | --- package.json
@@ -269,8 +269,8 @@
"pre-push": "run-p solidarity coverage"
}
},
- "packageManager": "yarn@4.6.0",
+ "packageManager": "yarn@4.1.1",
"engines": {
"node": ">=18"
}
-}
+}
\ No newline at end of file
| chore: revert yarn version | chore: revert yarn version
|
8b01b4c653d1ca22e8cf1e6393b10e92bf814b2b | --- package.json
@@ -93,7 +93,7 @@
"@walmart/ask-sam-mini-app": "1.35.21",
"@walmart/associate-exp-hub-hub": "2.21.2",
"@walmart/associate-exp-hub-team-switcher": "2.23.2",
- "@walmart/associate-listening-mini-app": "2.0.11",
+ "@walmart/associate-listening-mini-app": "2.0.37",
"@walmart/attendance-mini-app": "patch:@walmart/attendance-mini-app@npm:3.176.0#~/.yarn/patches/@walmart-attendance-mini-app-npm-3.176.0-b8336306f0.patch",
"@walmart/avp-feature-app": "0.28.47",
"@walmart/avp-shared-library": "0.27.24",
--- yarn.lock
@@ -7823,9 +7823,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/associate-listening-mini-app@npm:2.0.11":
- version: 2.0.11
- resolution: "@walmart/associate-listening-mini-app@npm:2.0.11::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fassociate-listening-mini-app%2F-%2F%40walmart%2Fassociate-listening-mini-app-2.0.11.tgz"
+"@walmart/associate-listening-mini-app@npm:2.0.37":
+ version: 2.0.37
+ resolution: "@walmart/associate-listening-mini-app@npm:2.0.37::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fassociate-listening-mini-app%2F-%2F%40walmart%2Fassociate-listening-mini-app-2.0.37.tgz"
dependencies:
"@walmart/associate-listening-utils": "npm:6.4.3"
peerDependencies:
@@ -7836,7 +7836,7 @@ __metadata:
"@walmart/gtp-shared-components-3": "*"
react: ^18.3.1
react-native: 0.79.5
- checksum: 10c0/c5ea63806083459021ed1ea839d4ea7066ee10161a74d5d6e139dc26bde513b1d4d88d3649bc51a7bcecfe61a19926b4fafbc911c3f8617d849a6b897e6e75a3
+ checksum: 10c0/5c366f5a82c322f094bb535ce2b44870cb383e298d49c2715c5c29cf835b5ab3c6551acafd989ba87caf14f353f70db5b13e17bc29f1149e0f2aa0857d18b454
languageName: node
linkType: hard
@@ -8855,7 +8855,7 @@ __metadata:
"@walmart/ask-sam-mini-app": "npm:1.35.21"
"@walmart/associate-exp-hub-hub": "npm:2.21.2"
"@walmart/associate-exp-hub-team-switcher": "npm:2.23.2"
- "@walmart/associate-listening-mini-app": "npm:2.0.11"
+ "@walmart/associate-listening-mini-app": "npm:2.0.37"
"@walmart/attendance-mini-app": "patch:@walmart/attendance-mini-app@npm:3.176.0#~/.yarn/patches/@walmart-attendance-mini-app-npm-3.176.0-b8336306f0.patch"
"@walmart/avp-feature-app": "npm:0.28.47"
"@walmart/avp-shared-library": "npm:0.27.24"
| fix(engage-1817): associate-listening-mini-app - drop35 homecard - 2 (#5271) | fix(engage-1817): associate-listening-mini-app - drop35 homecard - 2 (#5271)
Co-authored-by: Pavan Lingamallu - p0l04ug <Pavan.Lingamallu@walmart.com>
Co-authored-by: Daniel Mustafa - damusta <Daniel.Mustafa@walmart.com>
Co-authored-by: Shubhang Shah - s0s0zug <Shubhang.Shah@walmart.com>
Co-authored-by: Maksym Novakh - m0n09mr <Maksym.Novakh0@walmart.com>
Co-authored-by: Vishesh Hiremath - v0h00hj <Vishesh.Hiremath@walmart.com>
Co-authored-by: Hariharan Sundaram <hariharan.sundaram0@walmart.com>
Co-authored-by: Hitesh Arora - h0a006n <Hitesh.Arora@walmart.com> |
0adcf4c237d7eaba5ef8afe9cb76b7b5fd73892e | --- package.json
@@ -1,100 +1,100 @@
{
- "name": "allspark",
- "workspaces": [
- "./packages/allspark-utils",
- "./packages/allspark-foundation",
- "./packages/allspark-authentication",
- "./packages/me-at-walmart-common",
- "./packages/me-at-walmart-container",
- "./packages/*"
- ],
- "version": "1.16.0",
- "description": "",
- "private": true,
- "scripts": {
- "init": "npm i --workspaces",
- "test": "npm run build && jest",
- "testonly": "jest",
- "coverage": "npm run build && jest --coverage",
- "lint": "npm run lint --workspaces --if-present",
- "lint:fix": "npm run lint:fix --workspaces --if-present",
- "clean": "npm run clean --workspaces",
- "commit": "commit",
- "build": "npm run build --workspaces",
- "prepare": "husky"
- },
- "repository": {
- "type": "git",
- "url": "https://gecgithub01.walmart.com/allspark/allspark.git"
- },
- "author": "",
- "license": "ISC",
- "publishConfig": {
- "registry": "https://npme.walmart.com"
- },
- "devDependencies": {
- "@babel/core": "^7.20.0",
- "@babel/preset-env": "^7.20.0",
- "@babel/runtime": "^7.20.0",
- "@commitlint/config-conventional": "^16.2.1",
- "@graphql-codegen/cli": "^2.16.3",
- "@graphql-codegen/near-operation-file-preset": "^2.5.0",
- "@graphql-codegen/typescript": "^2.8.7",
- "@graphql-codegen/typescript-operations": "^2.5.10",
- "@graphql-codegen/typescript-react-apollo": "^3.3.7",
- "@react-native-community/eslint-config": "^2.0.0",
- "@react-native/babel-preset": "^0.74.0",
- "@redux-saga/testing-utils": "^1.1.3",
- "@testing-library/jest-native": "5.4.3",
- "@testing-library/react-hooks": "8.0.1",
- "@testing-library/react-native": "12.3.2",
- "@types/jest": "29.2.1",
- "@types/react": "^18.0.27",
- "@types/react-test-renderer": "^18.0.0",
- "@typescript-eslint/eslint-plugin": "^5.7.0",
- "@typescript-eslint/parser": "^5.7.0",
- "babel-jest": "29.2.1",
- "commitlint": "^16.2.3",
- "eslint": "8.19.0",
- "eslint-config-prettier": "9.0.0",
- "eslint-plugin-flowtype": "8.0.3",
- "eslint-plugin-jest": "27.6.0",
- "eslint-plugin-prettier": "5.1.3",
- "eslint-plugin-react-native": "4.1.0",
- "husky": "^9.0.11",
- "jest": "29.2.1",
- "jest-sonar-reporter": "^2.0.0",
- "lerna": "~7.4.2",
- "metro-react-native-babel-preset": "0.76.8",
- "prettier": "3.0.3",
- "react-test-renderer": "18.2.0",
- "typescript": "^4.7.4"
- },
- "overrides": {
- "@walmart/config-components": {
- "@walmart/core-services": "6.0.1",
- "@walmart/core-services-allspark": "6.0.1",
- "@walmart/core-utils": "6.0.1",
- "@walmart/redux-store": "6.0.1",
- "@react-native-firebase/analytics": "~17.4.2",
- "@react-native-firebase/app": "~17.4.2",
- "@react-native-firebase/crashlytics": "~17.4.2",
- "@react-native-firebase/database": "~17.4.2"
- },
- "react": "^18.2.0",
- "react-native": "~0.72.5",
- "eslint": "8.19.0",
- "eslint-plugin-jest": "27.6.0",
- "eslint-plugin-prettier": "5.1.3",
- "eslint-plugin-react-native": "4.1.0",
- "eslint-plugin-flowtype": "8.0.3",
- "@testing-library/react-hooks": "8.0.1",
- "@types/react": "^18.0.27",
- "react-test-renderer": "18.2.0",
- "@babel/core": "^7.20.0",
- "@babel/preset-env": "^7.20.0",
- "@babel/runtime": "^7.20.0",
- "babel-jest": "29.2.1",
- "metro-react-native-babel-preset": "0.76.8"
- }
+ "name": "allspark",
+ "workspaces": [
+ "./packages/allspark-utils",
+ "./packages/allspark-foundation",
+ "./packages/allspark-authentication",
+ "./packages/me-at-walmart-common",
+ "./packages/me-at-walmart-container",
+ "./packages/*"
+ ],
+ "version": "1.16.0",
+ "description": "",
+ "private": true,
+ "scripts": {
+ "init": "npm i --workspaces",
+ "test": "jest",
+ "coverage": "jest --coverage",
+ "lint": "npm run lint --workspaces --if-present",
+ "lint:fix": "npm run lint:fix --workspaces --if-present",
+ "clean": "npm run clean --workspaces",
+ "commit": "commit",
+ "build": "npm run build --workspaces",
+ "prepare": "husky",
+ "start": "node index.js"
+ },
+ "repository": {
+ "type": "git",
+ "url": "https://gecgithub01.walmart.com/allspark/allspark.git"
+ },
+ "author": "",
+ "license": "ISC",
+ "publishConfig": {
+ "registry": "https://npme.walmart.com"
+ },
+ "devDependencies": {
+ "@babel/core": "^7.20.0",
+ "@babel/preset-env": "^7.20.0",
+ "@babel/runtime": "^7.20.0",
+ "@commitlint/config-conventional": "^16.2.1",
+ "@graphql-codegen/cli": "^2.16.3",
+ "@graphql-codegen/near-operation-file-preset": "^2.5.0",
+ "@graphql-codegen/typescript": "^2.8.7",
+ "@graphql-codegen/typescript-operations": "^2.5.10",
+ "@graphql-codegen/typescript-react-apollo": "^3.3.7",
+ "@react-native-community/eslint-config": "^2.0.0",
+ "@react-native/babel-preset": "^0.74.0",
+ "@redux-saga/testing-utils": "^1.1.3",
+ "@testing-library/jest-native": "5.4.3",
+ "@testing-library/react-hooks": "8.0.1",
+ "@testing-library/react-native": "12.3.2",
+ "@types/jest": "29.2.1",
+ "@types/react": "^18.0.27",
+ "@types/react-test-renderer": "^18.0.0",
+ "@typescript-eslint/eslint-plugin": "^5.7.0",
+ "@typescript-eslint/parser": "^5.7.0",
+ "babel-jest": "29.2.1",
+ "commitlint": "^16.2.3",
+ "eslint": "8.19.0",
+ "eslint-config-prettier": "9.0.0",
+ "eslint-plugin-flowtype": "8.0.3",
+ "eslint-plugin-jest": "27.6.0",
+ "eslint-plugin-prettier": "5.1.3",
+ "eslint-plugin-react-native": "4.1.0",
+ "husky": "^9.0.11",
+ "jest": "29.2.1",
+ "jest-sonar-reporter": "^2.0.0",
+ "lerna": "~7.4.2",
+ "metro-react-native-babel-preset": "0.76.8",
+ "prettier": "3.0.3",
+ "react-test-renderer": "18.2.0",
+ "typescript": "^4.7.4"
+ },
+ "overrides": {
+ "@walmart/config-components": {
+ "@walmart/core-services": "5.0.0-beta.32",
+ "@walmart/core-services-allspark": "5.0.0-beta.32",
+ "@walmart/core-utils": "5.0.0-beta.32",
+ "@walmart/redux-store": "5.0.0-beta.32",
+ "@react-native-firebase/analytics": "~17.4.2",
+ "@react-native-firebase/app": "~17.4.2",
+ "@react-native-firebase/crashlytics": "~17.4.2",
+ "@react-native-firebase/database": "~17.4.2"
+ },
+ "react": "^18.2.0",
+ "react-native": "~0.72.5",
+ "eslint": "8.19.0",
+ "eslint-plugin-jest": "27.6.0",
+ "eslint-plugin-prettier": "5.1.3",
+ "eslint-plugin-react-native": "4.1.0",
+ "eslint-plugin-flowtype": "8.0.3",
+ "@testing-library/react-hooks": "8.0.1",
+ "@types/react": "^18.0.27",
+ "react-test-renderer": "18.2.0",
+ "@babel/core": "^7.20.0",
+ "@babel/preset-env": "^7.20.0",
+ "@babel/runtime": "^7.20.0",
+ "babel-jest": "29.2.1",
+ "metro-react-native-babel-preset": "0.76.8"
+ }
}
| reolving conflicts | reolving conflicts
|
038eda7b42ed070c9858eb427f300d68fd2e4b79 | --- ios/BuildSupport/install-cocoapods.sh
@@ -6,6 +6,7 @@ echo "Current Directory: $WORKSPACE"
echo "Installing CocoaPods"
CCP_VER=1.10.1
+POD_VERSION=$(pod --version)
export GEM_HOME=$HOME/.gem
export PATH=$GEM_HOME/bin:$PATH
@@ -14,8 +15,14 @@ export https_proxy=http://sysproxy.wal-mart.com:8080
export http_proxy=http://sysproxy.wal-mart.com:8080
export no_proxy=repository.walmart.com,repo.wal-mart.com,localhost,chromium.googlesource.com
-sudo gem uninstall cocoapods -a -x --user-install --verbose
-sudo gem install cocoapods -v ${CCP_VER} --user-install --verbose
+echo "local pod version: ${POD_VERSION}"
+
+if [ "$POD_VERSION" != "$CCP_VER" ]
+then
+ sudo gem uninstall cocoapods -a -x --user-install --verbose
+ sudo gem install cocoapods -v ${CCP_VER} --user-install --verbose
+fi
+
pod_path=$(ruby -r rubygems -e 'puts Gem.user_dir')/bin
echo "pod_path ${pod_path}"
| add condition for cocoapods install | add condition for cocoapods install
|
d72e8c33a755d21c28f8a0908c6bf3b7ae9d1a17 | --- package-lock.json
@@ -4208,9 +4208,9 @@
"integrity": "sha512-btkn4VE+5H2cyqPv47O3bytqSA2irOJ/+sT+pNl7CIanF+DuFYjDUNpddeDe7t0HRYTPLsEM07KlIhMrDYOsAA=="
},
"@walmart/feedback-all-spark-miniapp": {
- "version": "0.1.27",
- "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.1.27.tgz",
- "integrity": "sha512-0eZ0oo4p7uNUlriH478bBvYarvSXlW7OQRFlBVxFBf7vDD6xW6Z9v6qjG2jC1vEslPFCd7Sh1Sa/RMT+RsYUaQ=="
+ "version": "0.1.29",
+ "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.1.29.tgz",
+ "integrity": "sha512-zDRKneGFnM59urAlvKskIHxwpL5NlapmqeL3EL+2HOEZ+B38ZaRl4nmH5cRV813JD7nzytPO9qHtHHjiyeYpUw=="
},
"@walmart/functional-components": {
"version": "1.0.34",
@@ -4309,7 +4309,7 @@
"@walmart/patient-portal-mobile": {
"version": "2.1.14",
"resolved": "https://npme.walmart.com/@walmart/patient-portal-mobile/-/patient-portal-mobile-2.1.14.tgz",
- "integrity": "sha512-LhqS1Ogr1vi5Nj2/gIRPQnn/ogReKbIhXvXsLdDzltCibI5YGoKxHpReIQKp3YJ01xBUJyUBzrc3G/JCe7KYSg==",
+ "integrity": "sha1-6a8PZ45o8XUCL3Jj8H7rlEfmefQ=",
"requires": {
"@react-native-community/datetimepicker": "^3.0.3",
"@walmart/react-native-collapsible": "1.5.3",
@@ -4350,7 +4350,7 @@
"@walmart/react-native-collapsible": {
"version": "1.5.3",
"resolved": "https://npme.walmart.com/@walmart/react-native-collapsible/-/react-native-collapsible-1.5.3.tgz",
- "integrity": "sha512-A/eHjceqHN2FJVaimSrKO/wIHgP5ymIoiyTMRa10ce8NZ7ejhPelIkCqzwjvQ328HG38y7HPelvu/6xlsiFlUQ==",
+ "integrity": "sha1-XoOvTwTbUqaib/9Ii//qp9yNBQk=",
"requires": {
"prop-types": "^15.6.2"
}
@@ -18423,7 +18423,7 @@
"squiggly-localization": {
"version": "0.0.2",
"resolved": "https://npme.walmart.com/squiggly-localization/-/squiggly-localization-0.0.2.tgz",
- "integrity": "sha512-9j/XUl0XvLk5wksN/nhOcRHmHesVHopX7v3Z1Hv398/656CLarKW0FAqL28zjKO68YH566s8PM1gflrAayBuMA=="
+ "integrity": "sha1-3ksz5Io53VPnUBiRSVDpxDaSGHU="
},
"sshpk": {
"version": "1.16.1",
@@ -19818,7 +19818,7 @@
"wfm-allspark-data-library": {
"version": "0.0.11",
"resolved": "https://npme.walmart.com/wfm-allspark-data-library/-/wfm-allspark-data-library-0.0.11.tgz",
- "integrity": "sha512-o34ej3nNhCcy3uwWkOJcU/3zjXmX+VvbqiZrEgQwrxbO6cbJGxiK1Tz/JQX8j1lwi6cZFJKvDOucJtlduzVQrg==",
+ "integrity": "sha1-E27LsiPO+Sbj5h3p0FQpcH9VU8g=",
"requires": {
"@walmart/functional-components": "^1.0.22",
"@walmart/react-native-env": "^0.1.0",
@@ -19832,7 +19832,7 @@
"@walmart/react-native-env": {
"version": "0.1.0",
"resolved": "https://npme.walmart.com/@walmart/react-native-env/-/react-native-env-0.1.0.tgz",
- "integrity": "sha512-ooH0AqLGhS5PNcLaOWRHAEIIvrYIyTUXqshlHkgEKDLhLtGW8WvFu0mlcCXb1FEUc/PVmKEzHNHYV1gzGNBqxQ=="
+ "integrity": "sha1-ojNwDE5pPTzF1RuQXDc//Fnlpz0="
},
"moment": {
"version": "2.24.0",
@@ -19842,7 +19842,7 @@
"react-native-ssmp-sso-allspark": {
"version": "0.0.1-rc8",
"resolved": "https://npme.walmart.com/react-native-ssmp-sso-allspark/-/react-native-ssmp-sso-allspark-0.0.1-rc8.tgz",
- "integrity": "sha512-4ZWTteIvddzP7Lg3EM0KP1fDfcN8nx7v5yvHASCLUpoZvhxHQUkjj8uTt4TkJxvTuEK16w7mTwHDauTrIC/BJg=="
+ "integrity": "sha1-/SHw48C+3muBMp2bynExhYPZl0s="
}
}
},
--- package.json
@@ -78,7 +78,7 @@
"@walmart/config-components": "1.0.35",
"@walmart/counts-component-miniapp": "0.0.34",
"@walmart/exception-mini-app": "0.39.10",
- "@walmart/feedback-all-spark-miniapp": "0.1.27",
+ "@walmart/feedback-all-spark-miniapp": "0.1.29",
"@walmart/functional-components": "1.0.34",
"@walmart/gta-react-native-calendars": "0.0.15",
"@walmart/gtp-shared-components": "1.2.0",
@@ -155,7 +155,7 @@
"react-native-snap-carousel": "^3.9.1",
"react-native-sound-player": "0.10.9",
"react-native-splash-screen": "^3.2.0",
- "react-native-ssmp-sso-allspark": "1.2.4",
+ "react-native-ssmp-sso-allspark": "^1.2.4",
"react-native-svg": "^12.1.0",
"react-native-tab-view": "^3.1.1",
"react-native-table-component": "^1.2.1",
--- src/navigation/AssociateHallwayNav/MainStackNav.tsx
@@ -10,7 +10,10 @@ import {HealthSurveyMiniApp} from '@walmart/allspark-health-survey-mini-app';
import SettingsMiniApp from '@walmart/settings-mini-app';
import ImpersonationMiniApp from '@walmart/impersonation-mini-app';
import {Components, Properties} from '@walmart/push-to-talk-mini-app';
-import {FeedbackMiniApp} from '@walmart/feedback-all-spark-miniapp';
+import {
+ FeedbackMiniApp,
+ ShareConcernScreen,
+} from '@walmart/feedback-all-spark-miniapp';
import {FeedbackDialogScreen} from '@walmart/feedback-all-spark-miniapp/dist/src/feedback/containers/FeedbackDialogScreen';
import {SurveySaysDialogScreen} from '@walmart/feedback-all-spark-miniapp/dist/src/feedback/containers/SurveySaysDialogScreen';
import {ExceptionMiniApp as PinpointMiniApp} from '@walmart/exception-mini-app';
@@ -109,6 +112,10 @@ export const MainStackNav = () => {
<MainStack.Screen name='scheduleScreen' component={ScheduleMiniApp} />
<MainStack.Screen name='Feedback' component={FeedbackMiniApp} />
+ <MainStack.Screen
+ name='ShareConcerns'
+ component={ShareConcernScreen}
+ />
<MainStack.Screen name='Settings' component={SettingsMiniApp} />
| GDVCVR-8591-Feedback Miniapp design update | GDVCVR-8591-Feedback Miniapp design update
|
c4107cf3dfd5e8779f66f1ef4f3483317907a8f9 | --- package-lock.json
@@ -66,7 +66,9 @@
"@walmart/react-native-scanner-3.0": "0.4.2",
"@walmart/react-native-shared-navigation": "1.0.2",
"@walmart/react-native-sumo-sdk": "2.6.0",
+ "@walmart/roster-mini-app": "1.0.0",
"@walmart/ui-components": "1.15.1",
+ "@walmart/wmconnect-mini-app": "1.0.0",
"babel-jest": "^29.2.1",
"chance": "^1.1.11",
"eslint": "8.22.0",
@@ -11831,6 +11833,13 @@
"reselect": ">=4.1.5"
}
},
+ "node_modules/@walmart/roster-mini-app": {
+ "version": "1.0.0",
+ "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.0.0.tgz",
+ "integrity": "sha512-GfHPbO35p425kjHzGP7m+taw4qO3HyBFRq5SZyVhyjP9AgY/vWuuFDAJxgDGXqt7LcX/D/le8fkqd6HPVHVKbg==",
+ "dev": true,
+ "hasInstallScript": true
+ },
"node_modules/@walmart/ui-components": {
"version": "1.15.1",
"resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.15.1.tgz",
@@ -11853,6 +11862,13 @@
"react-native-webview": ">=10.10.2"
}
},
+ "node_modules/@walmart/wmconnect-mini-app": {
+ "version": "1.0.0",
+ "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.0.tgz",
+ "integrity": "sha512-09PNfJZO3ZUZyfOKQ9aZRNf6zGYCDsTIqFCQbIgrdGLFNhUFDOaVUt6Kc+WZNvt5AyJd647Sd9M0cdQddd2QTA==",
+ "dev": true,
+ "hasInstallScript": true
+ },
"node_modules/@whatwg-node/events": {
"version": "0.0.2",
"resolved": "https://npme.walmart.com/@whatwg-node/events/-/events-0.0.2.tgz",
@@ -41056,6 +41072,12 @@
"reduxsauce": "^1.2.1"
}
},
+ "@walmart/roster-mini-app": {
+ "version": "1.0.0",
+ "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.0.0.tgz",
+ "integrity": "sha512-GfHPbO35p425kjHzGP7m+taw4qO3HyBFRq5SZyVhyjP9AgY/vWuuFDAJxgDGXqt7LcX/D/le8fkqd6HPVHVKbg==",
+ "dev": true
+ },
"@walmart/ui-components": {
"version": "1.15.1",
"resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.15.1.tgz",
@@ -41067,6 +41089,12 @@
"react-native-elements": "^3.4.2"
}
},
+ "@walmart/wmconnect-mini-app": {
+ "version": "1.0.0",
+ "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.0.tgz",
+ "integrity": "sha512-09PNfJZO3ZUZyfOKQ9aZRNf6zGYCDsTIqFCQbIgrdGLFNhUFDOaVUt6Kc+WZNvt5AyJd647Sd9M0cdQddd2QTA==",
+ "dev": true
+ },
"@whatwg-node/events": {
"version": "0.0.2",
"resolved": "https://npme.walmart.com/@whatwg-node/events/-/events-0.0.2.tgz",
--- package.json
@@ -89,6 +89,8 @@
"@walmart/react-native-shared-navigation": "1.0.2",
"@walmart/react-native-sumo-sdk": "2.6.0",
"@walmart/ui-components": "1.15.1",
+ "@walmart/wmconnect-mini-app": "1.0.0",
+ "@walmart/roster-mini-app": "1.0.0",
"babel-jest": "^29.2.1",
"chance": "^1.1.11",
"eslint": "8.22.0",
--- src/screens/TabsScreen.tsx
@@ -4,11 +4,11 @@ import {StackNavigationProp} from '@react-navigation/stack';
import {LivingDesignTabBar} from '../navigation/components';
import {TextingNavParamsMap} from '../navigation/types';
import {UserHeader} from '../containers/UserHeader';
-import {RosterScreen} from './RosterScreen';
import {useTranslation} from 'react-i18next';
import {TEXTING_I18N_NAMESPACE} from '../translations';
import {WarningBanner} from '../containers/WarningBanner';
-import {ChannelsScreen} from './ChannelsScreen';
+import {WMConnectMiniApp} from '@walmart/wmconnect-mini-app';
+import {RosterScreen} from '@walmart/roster-mini-app';
type TabsScreenProps = {
navigation: StackNavigationProp<TextingNavParamsMap, 'myTeam.tabs'>;
@@ -42,7 +42,7 @@ export const TabsScreen: React.FC<TabsScreenProps> = () => {
lazy: true,
//tabBarBadge: UnreadBadge, //TODO: Import from texting app
}}
- component={ChannelsScreen} //TODO: Import from texting mini app
+ component={WMConnectMiniApp} //TODO: Import from texting mini app
/>
</MainTab.Navigator>
</>
| Integrate Roster and WMConnect Mini app | Integrate Roster and WMConnect Mini app
|
72da3d2361d216d9a5d191df87f04339911822c7 | --- __tests__/appBlock/AppBlockingScreen.test.tsx
@@ -56,4 +56,14 @@ describe('AppBlockingScreen', () => {
{},
);
});
+ test('should not render update button when there is no urls', () => {
+ const data = {};
+ (useSelector as jest.Mock).mockReturnValue(data);
+
+ const {queryByTestId} = render(<AppBlockingScreen />);
+
+ expect(queryByTestId('downloadButton')).toBeNull();
+ expect(Telemetry.logScreenView).toHaveBeenCalledWith('core.appDisabledScreen');
+ expect(Logger.info).toHaveBeenCalledWith('app disabled, prompting user', {});
+ });
});
--- __tests__/appState/AppStateSagasTest.ts
@@ -35,7 +35,7 @@ describe('watchForAppStateChange', () => {
const iterator = watchForAppStateChange();
expect(iterator.next().value).toEqual(call(createAppStateChannel));
expect(iterator.next(mockChannel).value).toEqual(take(mockChannel));
- expect(iterator.next('unhandled').done).toEqual(false);
+ expect(iterator.next(undefined).done).toEqual(false);
});
it('closes channel if cancelled', () => {
--- __tests__/core/syncDeviceLanguageTest.ts
@@ -1,16 +1,19 @@
import {AllsparkLocalStorage} from '@walmart/allspark-foundation/LocalStorage';
import {AllsparkTranslationClient} from '@walmart/allspark-foundation/Translation';
-
import {
getPersistedLanguage,
onLanguageChange,
syncDeviceLanguage,
} from '../../src/core/syncDeviceLanguage';
-const ChangeLanguageSpy = jest.spyOn(
- AllsparkTranslationClient,
- 'changeLanguage',
-);
+
+jest.mock('moment', ()=>({
+ ...jest.requireActual('moment'),
+ locales: jest.fn(),
+ locale: jest.fn(),
+}));
+
+const moment = require('moment');
test('getPersistedLanguage', async () => {
(AllsparkLocalStorage.get as jest.Mock).mockResolvedValue(
@@ -36,13 +39,16 @@ test('onLanguageChange', async () => {
});
describe('syncDeviceLanguage', () => {
+
+ moment.locales.mockReturnValue(['en-US', 'es']);
+ moment.locale.mockReturnValue('en');
beforeEach(jest.clearAllMocks);
it('does not change language if device language matches current language', async () => {
AllsparkTranslationClient.getSupportedLanguages.mockReturnValue(['en-US', 'es-MX']);
AllsparkTranslationClient.language = 'en-US';
(AllsparkLocalStorage.get as jest.Mock).mockResolvedValue('en-US');
await syncDeviceLanguage();
- expect(ChangeLanguageSpy).not.toHaveBeenCalled();
+ expect(AllsparkTranslationClient.changeLanguage).not.toHaveBeenCalled();
});
it('changes language if device language doesnt match current language', async () => {
@@ -50,7 +56,7 @@ describe('syncDeviceLanguage', () => {
'{"language":"es-MX"}',
);
await syncDeviceLanguage();
- expect(ChangeLanguageSpy).toHaveBeenCalledWith('es-MX');
+ expect(AllsparkTranslationClient.changeLanguage).toHaveBeenCalledWith('es-MX');
});
it('get device langauage when getPersistedLanguage return null', async () => {
(AllsparkLocalStorage.get as jest.Mock).mockRejectedValue(new Error('Mocked error: unable to retrieve language key'));
@@ -59,4 +65,13 @@ describe('syncDeviceLanguage', () => {
await syncDeviceLanguage();
expect(AllsparkTranslationClient.changeLanguage).toBeCalledWith('en-US');
});
+ it('change moment locale if language is in available locales', async () => {
+ AllsparkTranslationClient.getSupportedLanguages.mockReturnValue(['en-US', 'es-MX']);
+ AllsparkTranslationClient.language = 'en-US';
+ (AllsparkLocalStorage.get as jest.Mock).mockResolvedValue('fr-FR');
+
+ await syncDeviceLanguage();
+
+ expect(moment.locale).toHaveBeenCalled();
+ });
});
--- __tests__/startup/AuthFlowTest.ts
@@ -1,11 +1,17 @@
import {createMockTask} from '@redux-saga/testing-utils';
import {call, cancel, fork, take} from 'redux-saga/effects';
+import {
+ AuthActionTypes,
+ AuthService,
+} from '@walmart/allspark-foundation/Auth';
+import {LoggerService} from '@walmart/allspark-foundation/Logger';
+import {TelemetryService} from '@walmart/allspark-foundation/Telemetry';
+import {noop} from '@walmart/allspark-utils';
import {
isSilentSignInError,
authFlow,
waitForAuth,
} from '../../src/startup/AuthFlow';
-import {AuthActionTypes} from '@walmart/allspark-foundation/Auth';
import {AllsparkNavigationClient} from '@walmart/allspark-foundation/Navigation';
describe('isSilentSignInError', () => {
@@ -99,6 +105,51 @@ describe('authFlow', () => {
take([AuthActionTypes.SIGN_IN_SUCCESS, AuthActionTypes.SIGN_IN_ERROR])
);
});
+ it('handles invalid grant error', () => {
+ (AuthService.signOut as jest.Mock).mockImplementation(() => Promise.resolve().catch(noop))
+ const signInAction = {
+ type: AuthActionTypes.SIGN_IN_ERROR,
+ payload: {code: 'invalid_grant', message: 'Invalid grant error'},
+ };
+ const iterator = authFlow();
+
+ expect(iterator.next().value).toEqual(
+ take([AuthActionTypes.SIGN_IN_SUCCESS, AuthActionTypes.SIGN_IN_ERROR])
+ );
+
+ expect(iterator.next(signInAction).value).toEqual(
+ call(isSilentSignInError, signInAction.payload)
+ );
+
+ expect(LoggerService.getFeatureInstance('auth')?.info).toHaveBeenCalledWith(
+ 'AUTH: SIGN_OUT_INITIATED',
+ {source: 'auth-flow'}
+ );
+
+ expect(TelemetryService.getFeatureInstance('auth')?.logEvent).toHaveBeenCalledWith(
+ 'sign_out_init_on_invalid_grant',
+ {
+ category: signInAction.category?.toLowerCase() || 'sign_in_error',
+ source: 'auth-flow',
+ }
+ );
+
+ expect(AuthService.signOut).toHaveBeenCalled();
+
+ expect(iterator.next(false).value).toEqual(
+ take([AuthActionTypes.SIGN_IN_SUCCESS, AuthActionTypes.SIGN_IN_ERROR])
+ );
+
+ expect(AllsparkNavigationClient.navigate).toHaveBeenCalledWith(
+ 'Core.ErrorScreen',
+ {
+ authError: {
+ code: signInAction.payload.code,
+ message: signInAction.payload.message,
+ },
+ }
+ );
+ });
});
describe('waitForAuth', () => {
| test(ui): ALLSPARK-5804 authflow syncdevice appstate tests (#4085) | test(ui): ALLSPARK-5804 authflow syncdevice appstate tests (#4085)
|
8b8a087ed317f5604c1a6f73195d34ee2be547ec | --- package.json
@@ -88,7 +88,7 @@
"@walmart/counts-component-miniapp": "0.1.2",
"@walmart/emergency-mini-app": "1.19.0",
"@walmart/exception-mini-app": "1.0.16",
- "@walmart/facilities-management-miniapp": "0.5.26",
+ "@walmart/facilities-management-miniapp": "0.5.27",
"@walmart/feedback-all-spark-miniapp": "0.9.10",
"@walmart/financial-wellbeing-feature-app": "1.1.2",
"@walmart/functional-components": "2.0.6",
| version update | version update
|
83a185ccd01887c22b7f25a34d6a0264e7b69c19 | --- src/components/Roster/AssociateListItem.tsx
@@ -10,7 +10,7 @@ import {
import {useTranslation} from 'react-i18next';
import {ROSTER_I18N_NAMESPACE} from '../../translations';
import {shallowEqual, useSelector} from 'react-redux';
-import {SiteSelectors} from '@walmart/redux-store';
+import {SiteSelectors, UserSelectors} from '@walmart/redux-store';
import {
useRbacConfigWithJobCode,
useUserIsInRoster,
@@ -64,6 +64,8 @@ export const AssociateListItem: React.FC<AssociateListItemProps> = React.memo(
SiteSelectors.getSiteCountry,
);
+ const currentUser = useSelector(UserSelectors.getUser) as Associate;
+
const shouldShowStatusChipAndWeeklySchedule: boolean | undefined =
useRbacConfigWithJobCode();
const userIsInRoster = useUserIsInRoster();
@@ -77,6 +79,8 @@ export const AssociateListItem: React.FC<AssociateListItemProps> = React.memo(
const showJobDescription = useSelector(displayJobDescription);
const showHourlySchedule = useSelector(displayHourlySchedule);
const showManagerSchedule = useSelector(displayManagerSchedule);
+ const shouldShowMessageButton =
+ associate?.win?.toString() !== currentUser?.win?.toString();
const associateName = namecase(
associateDisplayName(associate)?.slice(0, 20),
@@ -120,23 +124,27 @@ export const AssociateListItem: React.FC<AssociateListItemProps> = React.memo(
/>
)}
- {isMessageButtonEnabled && !isNil(actionButtons) && (
- <View style={styles.buttonsStyle}>
- {actionButtons.map((actionButton: RosterActionButton) => {
- return (
- <Button
- variant={'secondary'}
- UNSAFE_style={styles.actionButtonSpacing}
- onPress={() => actionButton.action(participants)}
- size={'small'}
- disabled={!userIsInRoster || !userIsImpersonatedOnDev}
- testID={`actionButton-${actionButton.i18nLabel}`}>
- <Text>{t(actionButton.i18nLabel)}</Text>
- </Button>
- );
- })}
- </View>
- )}
+ {isMessageButtonEnabled &&
+ shouldShowMessageButton &&
+ !isNil(actionButtons) && (
+ <View style={styles.buttonsStyle}>
+ {actionButtons.map((actionButton: RosterActionButton) => {
+ return (
+ <Button
+ variant={'secondary'}
+ UNSAFE_style={styles.actionButtonSpacing}
+ onPress={() => actionButton.action(participants)}
+ size={'small'}
+ disabled={
+ !userIsInRoster || !userIsImpersonatedOnDev
+ }
+ testID={`actionButton-${actionButton.i18nLabel}`}>
+ <Text>{t(actionButton.i18nLabel)}</Text>
+ </Button>
+ );
+ })}
+ </View>
+ )}
</>
}>
{showJobDescription && (
| Update message button | Update message button
|
c3d3a48e23d0e2ddb6aa8c98498802a4609bbdb0 | --- example/ios/Podfile.lock
@@ -1698,4 +1698,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 9bcb4ba63e465bf176432abd9b231eff81ba3324
-COCOAPODS: 1.14.3
+COCOAPODS: 1.13.0
| feat: updated pod file | feat: updated pod file
|
d07c51690ea12d629ee81db8da25d72c790984ef | --- package-lock.json
@@ -37,7 +37,7 @@
"@terrylinla/react-native-sketch-canvas": "0.8.0",
"@walmart/allspark-graphql-client": "^1.4.5",
"@walmart/allspark-neon-core": "0.1.31",
- "@walmart/amp-mini-app": "1.1.68",
+ "@walmart/amp-mini-app": "1.1.72",
"@walmart/ask-sam-chat-components": "^0.2.7",
"@walmart/ask-sam-mini-app": "1.17.10",
"@walmart/attendance-mini-app": "1.62.13",
@@ -8377,9 +8377,9 @@
}
},
"node_modules/@walmart/amp-mini-app": {
- "version": "1.1.68",
- "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.68.tgz",
- "integrity": "sha512-GxB3j9H+V54aL9BohPBrQMUKZrSnJypK+NqPiIpWLiEXicOcpV7rfSK9XGKggMk0TXothUOEMqUKJT6SBVnitg==",
+ "version": "1.1.72",
+ "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.72.tgz",
+ "integrity": "sha512-uMPvYGMHz0IivWMxLcfWH/uvZh8BvenUJwftLhTkdMd5Suv3WZTxSFla2jy1RQ3ws2F0e73PMoFZopAxSeYqXQ==",
"hasInstallScript": true,
"peerDependencies": {
"@react-navigation/native": "^6.0.0",
@@ -29417,7 +29417,7 @@
"requires": {
"mv": "~2",
"safe-json-stringify": "~1",
- "uuid": "^8.0.0"
+ "uuid": "^3.3.2"
}
},
"@expo/cli": {
@@ -30107,7 +30107,7 @@
"md5": "^2.2.1",
"node-fetch": "^2.6.1",
"remove-trailing-slash": "^0.1.0",
- "uuid": "^8.3.2"
+ "uuid": "^3.3.2"
}
},
"@expo/sdk-runtime-versions": {
@@ -33121,9 +33121,9 @@
}
},
"@walmart/amp-mini-app": {
- "version": "1.1.68",
- "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.68.tgz",
- "integrity": "sha512-GxB3j9H+V54aL9BohPBrQMUKZrSnJypK+NqPiIpWLiEXicOcpV7rfSK9XGKggMk0TXothUOEMqUKJT6SBVnitg=="
+ "version": "1.1.72",
+ "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.72.tgz",
+ "integrity": "sha512-uMPvYGMHz0IivWMxLcfWH/uvZh8BvenUJwftLhTkdMd5Suv3WZTxSFla2jy1RQ3ws2F0e73PMoFZopAxSeYqXQ=="
},
"@walmart/ask-sam-chat-components": {
"version": "0.2.13",
--- package.json
@@ -78,7 +78,7 @@
"@terrylinla/react-native-sketch-canvas": "0.8.0",
"@walmart/allspark-graphql-client": "^1.4.5",
"@walmart/allspark-neon-core": "0.1.31",
- "@walmart/amp-mini-app": "1.1.68",
+ "@walmart/amp-mini-app": "1.1.72",
"@walmart/ask-sam-chat-components": "^0.2.7",
"@walmart/ask-sam-mini-app": "1.17.10",
"@walmart/attendance-mini-app": "1.62.13",
| AMP crash fix | AMP crash fix
|
b57da07e864533bd835365d56e4b70cbe86432d6 | --- example/src/feature3/screens/index.ts
@@ -1,14 +1,12 @@
import {ContainerScreen} from './container';
import {TestModal} from './modal';
-import {OnboardingScreen} from './onboarding';
import {HomeScreen} from './screen';
import {FeatureStack} from './stack';
export const Feature3Screens = {
'feature3.home': HomeScreen,
- 'feature3.onboarding': OnboardingScreen,
'feature3.container': ContainerScreen,
- 'feature1.stack': FeatureStack,
+ 'feature3.stack': FeatureStack,
};
export const Feature3Modals = {
| feat: remove unused import | feat: remove unused import
|
6ff4c8742223fa743b12fb80d20431b065d07d69 | --- packages/allspark-foundation/__tests__/LocalStorage/client.test.tsx
@@ -1,17 +1,6 @@
import { LocalStorageClient } from '../../src/LocalStorage/client';
import AsyncStorage from '@react-native-async-storage/async-storage';
-jest.mock('@react-native-async-storage/async-storage', () => ({
- getItem: jest.fn(),
- setItem: jest.fn(),
- removeItem: jest.fn(),
- mergeItem: jest.fn(),
- multiGet: jest.fn(),
- multiSet: jest.fn(),
- multiMerge: jest.fn(),
- multiRemove: jest.fn(),
- getAllKeys: jest.fn(),
-}));
describe('LocalStorageClient', () => {
let client;
| moving local storage lib to global | moving local storage lib to global
|
29941530b56c17ec01241c912e4024f298852d99 | --- package-lock.json
@@ -40,7 +40,7 @@
"@walmart/amp-mini-app": "1.1.48",
"@walmart/ask-sam-chat-components": "^0.2.7",
"@walmart/ask-sam-mini-app": "1.13.4",
- "@walmart/attendance-mini-app": "1.35.0",
+ "@walmart/attendance-mini-app": "1.37.0",
"@walmart/compass-sdk-rn": "4.2.0",
"@walmart/config-components": "4.2.1",
"@walmart/copilot-mini-app": "1.77.9",
@@ -7991,9 +7991,9 @@
}
},
"node_modules/@walmart/attendance-mini-app": {
- "version": "1.35.0",
- "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-1.35.0.tgz",
- "integrity": "sha512-wonue8UZNEZtp/zYXqUjtn0vkrnYyujAI2yeRTF6/m97gPs0U8+Tpp1n+2L/5rkotCXJQSxUzb1JMKtqiRZxkQ==",
+ "version": "1.37.0",
+ "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-1.37.0.tgz",
+ "integrity": "sha512-BOvOwfB40oD/YSQgNl9c78aQhoq9awjjjGQqEwvbk8aMeZPSMmYUnKi1jyQlFe1kIc3rxVjr4okjp7mp4LfN2A==",
"dependencies": {
"@walmart/gta-react-native-calendars": "^0.0.16",
"@walmart/wfm-ui": "^0.2.26",
@@ -33515,9 +33515,9 @@
}
},
"@walmart/attendance-mini-app": {
- "version": "1.35.0",
- "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-1.35.0.tgz",
- "integrity": "sha512-wonue8UZNEZtp/zYXqUjtn0vkrnYyujAI2yeRTF6/m97gPs0U8+Tpp1n+2L/5rkotCXJQSxUzb1JMKtqiRZxkQ==",
+ "version": "1.37.0",
+ "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-1.37.0.tgz",
+ "integrity": "sha512-BOvOwfB40oD/YSQgNl9c78aQhoq9awjjjGQqEwvbk8aMeZPSMmYUnKi1jyQlFe1kIc3rxVjr4okjp7mp4LfN2A==",
"requires": {
"@walmart/gta-react-native-calendars": "^0.0.16",
"@walmart/wfm-ui": "^0.2.26",
--- package.json
@@ -81,7 +81,7 @@
"@walmart/amp-mini-app": "1.1.48",
"@walmart/ask-sam-chat-components": "^0.2.7",
"@walmart/ask-sam-mini-app": "1.13.4",
- "@walmart/attendance-mini-app": "1.35.0",
+ "@walmart/attendance-mini-app": "1.37.0",
"@walmart/compass-sdk-rn": "4.2.0",
"@walmart/config-components": "4.2.1",
"@walmart/copilot-mini-app": "1.77.9",
| ama v1.37.0 | ama v1.37.0
|
ca13409a59cbaff0dfa2401a235d0c4ece1ba72e | --- packages/allspark-foundation/__tests__/GraphQL/hooks.test.ts
@@ -0,0 +1,79 @@
+import { renderHook } from '@testing-library/react-native';
+
+import {
+ useQuery,
+ useLazyQuery,
+ useSuspenseQuery,
+ useMutation,
+} from '../../src/GraphQL/hooks';
+import { useQuery as useQueryBase,
+ useLazyQuery as useLazyQueryBase,
+ useSuspenseQuery as useSuspenseQueryBase,
+ useMutation as useMutationBase } from '@apollo/client';
+import { useHttpClient } from '../../src/HTTP';
+
+jest.mock('@apollo/client');
+
+jest.mock('../../src/HTTP', () => ({
+ useHttpClient: jest.fn(),
+}));
+
+describe('Custom Apollo Hooks', () => {
+ const mockQuery = {};
+ const mockOptions = { variables: { someVar: 'value' }, featureId: 'someFeatureId' };
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
+ it('useQuery should pass featureId from options', () => {
+ const mockResult = { data: {} };
+ (useHttpClient as jest.Mock).mockReturnValue({ featureId: 'testFeatureId' });
+ (useQueryBase as jest.Mock).mockReturnValue(mockResult);
+ const { result } = renderHook(() =>
+ useQuery(mockQuery, { ...mockOptions, featureId: 'someFeatureId' })
+ );
+ expect(useQueryBase).toHaveBeenCalledWith(mockQuery, {
+ ...mockOptions,
+ context: { featureId: 'someFeatureId' },
+ });
+ expect(result.current).toBe(mockResult);
+ });
+ it('useLazyQuery should pass featureId from options', () => {
+ const mockResult = { data: {} };
+ (useHttpClient as jest.Mock).mockReturnValue({ featureId: 'testFeatureId' });
+ (useLazyQueryBase as jest.Mock).mockReturnValue([mockResult]);
+ const { result } = renderHook(() =>
+ useLazyQuery(mockQuery, { ...mockOptions, featureId: 'someFeatureId' })
+ );
+ expect(useLazyQueryBase).toHaveBeenCalledWith(mockQuery, {
+ ...mockOptions,
+ context: { featureId: 'someFeatureId' },
+ });
+ expect(result.current).toStrictEqual([mockResult]);
+ });
+ it('useSuspenseQuery should pass featureId from options', () => {
+ const mockResult = { data: {} };
+ (useHttpClient as jest.Mock).mockReturnValue({ featureId: 'testFeatureId' });
+ (useSuspenseQueryBase as jest.Mock).mockReturnValue(mockResult);
+ const { result } = renderHook(() =>
+ useSuspenseQuery(mockQuery, { ...mockOptions, featureId: 'someFeatureId' })
+ );
+ expect(useSuspenseQueryBase).toHaveBeenCalledWith(mockQuery, {
+ ...mockOptions,
+ context: { featureId: 'someFeatureId' },
+ });
+ expect(result.current).toBe(mockResult);
+ });
+ it('useMutation should pass featureId from options', () => {
+ const mockResult = [jest.fn()];
+ (useHttpClient as jest.Mock).mockReturnValue({ featureId: 'testFeatureId' });
+ (useMutationBase as jest.Mock).mockReturnValue(mockResult);
+ const { result } = renderHook(() =>
+ useMutation(mockQuery, { ...mockOptions, featureId: 'someFeatureId' })
+ );
+ expect(useMutationBase).toHaveBeenCalledWith(mockQuery, {
+ ...mockOptions,
+ context: { featureId: 'someFeatureId' },
+ });
+ expect(result.current).toStrictEqual(mockResult);
+ });
+ });
\ No newline at end of file
| graphql hook tests | graphql hook tests
|
991df9c27bfc6a9243b096c066afed41ad3ae262 | --- packages/allspark-foundation-hub/src/HubFeature/TeamSelection/Component/TeamSelectionList.tsx
@@ -126,8 +126,11 @@ export const TeamSelectionList = ({
});
const handleCancelButton = () => {
- //TODO: Add home screen navigation
- AllsparkNavigationClient.navigate(hubScreeName);
+ if (isUserAlreadyOnboarded) {
+ AllsparkNavigationClient.goBack();
+ } else {
+ AllsparkNavigationClient.dispatch(StackActions.pop(2));
+ }
teamSelectionTelemetry.logEvent('team_selection_cancel_event', {
win: win as string,
site: String(site),
| update the navigation for onboarding | update the navigation for onboarding
|
7afca768d23fe4cc14f3af4fb3a7548ec8bbc357 | --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/index.ts
@@ -1,3 +1,3 @@
-export * from './Shared/Components/HubHeader';
-export * from './Shared/Components/Popover';
+export * from '../Shared/Components/HubHeader';
+export * from '../Shared/Components/Popover';
export * from './Components/TeamShiftSwitcher';
| feat: fixed broken imports | feat: fixed broken imports
|
65277b34b4a41dc78a5dccf92a921c6011d3c36c | --- package-lock.json
@@ -4243,9 +4243,9 @@
}
},
"@walmart/impersonation-mini-app": {
- "version": "1.0.20",
- "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.0.20.tgz",
- "integrity": "sha512-aPs0urHbFuCTv7I7E8+4q8+lNnabvECiyhnFBvKFp2AIP6lPuRyuCjevDW4EkqrNQ2UKOiS18GiC5Oxl+FduLQ=="
+ "version": "1.0.24",
+ "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.0.24.tgz",
+ "integrity": "sha512-YI7uRzEn+/zFdSIeJHozor94HAtCtiMJFpii9NGPuWdXsWc6adqQOyUt9OSQ9KBw7GXsN5Z3ItexG5AjRXxhXw=="
},
"@walmart/ims-print-services-ui": {
"version": "0.0.36",
--- package.json
@@ -81,7 +81,7 @@
"@walmart/functional-components": "1.0.34",
"@walmart/gta-react-native-calendars": "0.0.15",
"@walmart/gtp-shared-components": "^1.2.0",
- "@walmart/impersonation-mini-app": "1.0.20",
+ "@walmart/impersonation-mini-app": "1.0.24",
"@walmart/ims-print-services-ui": "0.0.36",
"@walmart/inbox-mini-app": "0.21.0",
"@walmart/iteminfo-mini-app": "2.0.16",
| exit impersonation fix | exit impersonation fix
|
c7273d8f5eee836e58729256e15afb25e0f7b160 | --- src/components/RosterWidget/useRosterWidget.ts
@@ -161,8 +161,9 @@ export const useRosterWidget = (
if (selectedTeamIds?.includes(teamData?.teamId as string)) {
scheduledCount =
scheduledCount +
- (teamData.membership?.filter(associateIsScheduled)
- ?.length as number);
+ (teamData.membership?.filter((team: any) =>
+ associateIsScheduled(team?.associate),
+ )?.length as number);
//TODO: Update team type
clockedInCount =
clockedInCount +
| Update roster widget schedule count | Update roster widget schedule count
|
ee6526087f97d41183060be1fd98510e9ce42175 | --- core/src/core/FeatureToggleGuard.tsx
@@ -7,6 +7,7 @@ import React, {
import {AllsparkNavigationClient} from '@walmart/allspark-foundation/Navigation';
import {useAllsparkTranslation} from '@walmart/allspark-foundation/Translation';
import {useOneClick} from '../oneClick/useOneClick';
+import {colors} from '@walmart/gtp-shared-components';
import {
Button,
ButtonGroup,
@@ -22,6 +23,7 @@ const styles = StyleSheet.create({
container: {
flex: 1,
justifyContent: 'center',
+ backgroundColor: colors.white,
},
imageStyle: {
height: 140,
| fix: oneClick FeatureToggleGuard fix | fix: oneClick FeatureToggleGuard fix
|
7b7d58398bceb86860e8cd4734328dd38faf0550 | --- targets/US/package.json
@@ -144,7 +144,7 @@
"@walmart/returns-mini-app": "4.16.6",
"@walmart/rfid-scan-mini-app": "2.8.5",
"@walmart/rn-mobile-sdk-pairing": "2.1.4-osirisfix.4",
- "@walmart/rn-receiving-mini-app": "2.4.80",
+ "@walmart/rn-receiving-mini-app": "2.4.81",
"@walmart/roster-mini-app": "2.15.0",
"@walmart/schedule-mini-app": "1.13.0",
"@walmart/shelfavailability-mini-app": "1.5.41",
--- yarn.lock
@@ -7082,9 +7082,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/loadquality-mini-app@npm:1.0.219":
- version: 1.0.219
- resolution: "@walmart/loadquality-mini-app@npm:1.0.219::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Floadquality-mini-app%2F-%2Floadquality-mini-app-1.0.219.tgz"
+"@walmart/loadquality-mini-app@npm:2.0.8":
+ version: 2.0.8
+ resolution: "@walmart/loadquality-mini-app@npm:2.0.8"
dependencies:
"@walmart/atlas-rn-ui-components": "npm:1.1.35"
peerDependencies:
@@ -7115,7 +7115,7 @@ __metadata:
react-native-svg: ">=14.0.0"
react-native-svg-transformer: ">=1.3.0"
react-native-vision-camera: "*"
- checksum: 10c0/0faca0f40e2bf05d682029392543e900551ee543df67cf1158f4fc5e128205d12dc810fc2909cbc5fd98e656984a32b26b80a629c72184ce976c1b20198d1a27
+ checksum: 10c0/d61cf1fe8ac0868ce9edf48a2ba5eb94ad85bb7afae19e6e63f9a6847376b5dc9863d034b3492d6ee2fb3e404c883b2ae38fab804fc4a133b32f50a9ec5866e2
languageName: node
linkType: hard
@@ -7498,7 +7498,7 @@ __metadata:
"@walmart/returns-mini-app": "npm:4.16.6"
"@walmart/rfid-scan-mini-app": "npm:2.8.5"
"@walmart/rn-mobile-sdk-pairing": "npm:2.1.4-osirisfix.4"
- "@walmart/rn-receiving-mini-app": "npm:2.4.80"
+ "@walmart/rn-receiving-mini-app": "npm:2.4.81"
"@walmart/roster-mini-app": "npm:2.15.0"
"@walmart/schedule-mini-app": "npm:1.13.0"
"@walmart/shelfavailability-mini-app": "npm:1.5.41"
@@ -8186,12 +8186,12 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/rn-receiving-mini-app@npm:2.4.80":
- version: 2.4.80
- resolution: "@walmart/rn-receiving-mini-app@npm:2.4.80::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Frn-receiving-mini-app%2F-%2F%40walmart%2Frn-receiving-mini-app-2.4.80.tgz"
+"@walmart/rn-receiving-mini-app@npm:2.4.81":
+ version: 2.4.81
+ resolution: "@walmart/rn-receiving-mini-app@npm:2.4.81"
dependencies:
"@walmart/atlas-rn-ui-components": "npm:1.1.53"
- "@walmart/loadquality-mini-app": "npm:1.0.219"
+ "@walmart/loadquality-mini-app": "npm:2.0.8"
peerDependencies:
"@react-native-clipboard/clipboard": ">=1.14.0"
"@react-native/metro-config": ">=0.73.0"
@@ -8217,7 +8217,7 @@ __metadata:
react-native-svg: ">=14.1.0"
react-native-svg-transformer: ">=1.3.0"
react-native-vision-camera: "*"
- checksum: 10c0/1ee817b2373c469cec3320a4069137f8f1daaa488a4b2c75d1b2aa84f3a644db9eefd02ec04e6a5c8ebd2976c022028ddb3d0bac9b0832bc7b9f27cd33af4239
+ checksum: 10c0/b4e8600d9195b0f14aacfeb3d8a471f76d727f8516041881a11f030f1fbb55f7fc93a31fa98c998b9caca50e29b0152e3ec9cc98aee36f3a26140452a9e6ee9b
languageName: node
linkType: hard
| Drop28 - Receiving - 2.4.81 (#3994) | Drop28 - Receiving - 2.4.81 (#3994)
* lqa changes
* lqa changes
* lqa changes
---------
Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com> |
1eb17d4646f69ff97374d99fc5e8ba9d9411d09f | --- package.json
@@ -113,7 +113,7 @@
"@walmart/counts-component-miniapp": "0.3.4",
"@walmart/digital-locks-mini-app": "1.5.8",
"@walmart/emergency-mini-app": "1.32.5",
- "@walmart/exception-mini-app": "1.8.19",
+ "@walmart/exception-mini-app": "1.10.3",
"@walmart/expo-config-plugins": "0.8.0",
"@walmart/facilities-management-miniapp": "patch:@walmart/facilities-management-miniapp@npm%3A0.18.33-alpha1#~/.yarn/patches/@walmart-facilities-management-miniapp-npm-0.18.33-alpha1-8e1df08388.patch",
"@walmart/feedback-all-spark-miniapp": "patch:@walmart/feedback-all-spark-miniapp@npm%3A0.9.75#~/.yarn/patches/@walmart-feedback-all-spark-miniapp-npm-0.9.75-733d2d347a.patch",
--- yarn.lock
@@ -7884,32 +7884,38 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/exception-mini-app@npm:1.8.19":
- version: 1.8.19
- resolution: "@walmart/exception-mini-app@npm:1.8.19::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fexception-mini-app%2F-%2F%40walmart%2Fexception-mini-app-1.8.19.tgz"
+"@walmart/exception-mini-app@npm:1.10.3":
+ version: 1.10.3
+ resolution: "@walmart/exception-mini-app@npm:1.10.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fexception-mini-app%2F-%2F%40walmart%2Fexception-mini-app-1.10.3.tgz"
peerDependencies:
+ "@react-navigation/native": ">=7.1.0"
+ "@react-navigation/stack": ">=7.4.0"
"@walmart/allspark-foundation": "*"
- "@walmart/allspark-utils": ">=6.5.0"
- "@walmart/gtp-shared-components": ">=2.1.3"
- "@walmart/ims-print-services-ui": ">=2.11.3"
- "@walmart/react-native-logger": ">=1.34.8"
- "@walmart/react-native-scanner-3.0": ">=0.8.6"
- "@walmart/ui-components": ">=1.17.1"
+ "@walmart/allspark-utils": ">=6.9.0"
+ "@walmart/gtp-shared-components-3": ">=3.0.0"
+ "@walmart/ims-print-services-ui": ">=2.23.0"
+ "@walmart/me-at-walmart-common": ">=6.36.0"
+ "@walmart/react-native-scanner-3.0": ">=0.15.0"
+ axios: ">=1.6.0"
+ expo: "*"
+ expo-image: ">=1.10.0"
+ i18next: ">=23.0.0"
+ lodash: ">=4.0.0"
luxon: ">=1.28.0"
- react: ">=18.2.0"
- react-i18next: ">=12.0.0"
+ react: "*"
+ react-i18next: ">=13.0.0"
react-native: "*"
- react-native-device-info: ">=10.3.0"
- react-native-gesture-handler: ">=2.14.0"
- react-native-new-snap-carousel: ">=3.9.3"
- react-native-webview: ">=11.23.1"
- react-redux: ">=8.0.4"
- redux: ">=4.1.2"
+ react-native-device-info: ">=10.13.0"
+ react-native-pager-view: ">=6.7.0"
+ react-native-safe-area-context: ">=5.6.0"
+ react-native-webview: ">=13.14.0"
+ react-redux: ">=8.1.0"
+ redux: ">=4.2.1"
+ redux-saga: ">=1.2.0"
reduxsauce: ">=1.2.0"
reselect: ">=4.1.0"
uuid: ">=3.3.2"
- xdate: ">=0.8.2"
- checksum: 10c0/76e1f3b7bca63a26d7c5663a8c6feed56128cb1ea008f35ca5c31a78747ae355b3c71db238d69b92f4eb7103d3408293891f2492a68ef043414bdadbfc65edd8
+ checksum: 10c0/9afd3e7f17a1648edcb3acfefec57f7912ba5541883f125e9cf92dede9b23e611163c7f561f830a8e454fe5cdb975ff284de39196f2ea1ab467d7dd6c5f1befd
languageName: node
linkType: hard
@@ -8525,7 +8531,7 @@ __metadata:
"@walmart/counts-component-miniapp": "npm:0.3.4"
"@walmart/digital-locks-mini-app": "npm:1.5.8"
"@walmart/emergency-mini-app": "npm:1.32.5"
- "@walmart/exception-mini-app": "npm:1.8.19"
+ "@walmart/exception-mini-app": "npm:1.10.3"
"@walmart/expo-config-plugins": "npm:0.8.0"
"@walmart/facilities-management-miniapp": "patch:@walmart/facilities-management-miniapp@npm%3A0.18.33-alpha1#~/.yarn/patches/@walmart-facilities-management-miniapp-npm-0.18.33-alpha1-8e1df08388.patch"
"@walmart/feedback-all-spark-miniapp": "patch:@walmart/feedback-all-spark-miniapp@npm%3A0.9.75#~/.yarn/patches/@walmart-feedback-all-spark-miniapp-npm-0.9.75-733d2d347a.patch"
| feat(pinpoint): PEW-1704 drop 35 package bump (#5088) | feat(pinpoint): PEW-1704 drop 35 package bump (#5088)
|
2c6eb26b8cbecba9dec88e48ceadc2079a2d02dd | --- packages/allspark-foundation/src/Translation/TranslationClient.ts
@@ -42,6 +42,7 @@ export type TranslationClientOptions = {
export class TranslationClient {
public i18n: i18n;
private _config: TranslationClientConfig;
+ private _languageDetector?: LanguageDetectorAsyncModule;
constructor(options?: TranslationClientOptions) {
this._config = options?.config || DEFAULT_TRANSLATION_CLIENT_CONFIG;
@@ -58,6 +59,7 @@ export class TranslationClient {
this.i18n = i18nGlobal.createInstance(this._config);
+ this._languageDetector = options?.languageDetector;
if (options?.languageDetector) {
this.i18n.use(options.languageDetector);
}
@@ -115,25 +117,11 @@ export class TranslationClient {
if (globalI18n.language !== lng) {
globalI18n.changeLanguage(lng);
}
+ // Cache language selection if detector is available as it will be used on next app start
+ this._languageDetector?.cacheUserLanguage?.(lng);
});
};
- // private _addLanguageDetector(
- // languageDetector: LanguageDetectorAsyncModule
- // ): void {
- // if (this.i18n.services.languageDetector) {
- // __DEV__ &&
- // console.warn(
- // 'A language detector is already configured. Only one language detector can be used at a time.'
- // );
- // } else {
- // this.i18n.use(languageDetector);
- // this.i18n.language = undefined;
- // this.i18n.options.lng = undefined;
- // this.i18n.changeLanguage();
- // }
- // }
-
/**
* Configure the TranslationClient with options.
* This allows dynamic updates to the configuration, after instantiation.
@@ -218,4 +206,4 @@ export class TranslationClient {
* This allows the TranslationClient to be used as a drop-in replacement
* for the i18n instance in most cases.
**/
-export interface TranslationClient extends i18n {}
+export interface TranslationClient extends i18n { }
| fix(translation): selected langage not cached through default language detector if provided | fix(translation): selected langage not cached through default language detector if provided
|
9fa5a7cefae305b6d50f1a4c3b192bfe9b8240d2 | --- ios/Podfile.lock
@@ -338,7 +338,7 @@ PODS:
- React-Core
- react-native-pdf (6.2.2):
- React-Core
- - react-native-ptt-module (1.2.58):
+ - react-native-ptt-module (1.3.5):
- PTT (= 0.6.0-rc.6)
- React
- react-native-safe-area-context (3.1.8):
@@ -802,7 +802,7 @@ SPEC CHECKSUMS:
react-native-logger: 6d1a4098b9b035278c3691760a45be8ce56acd2e
react-native-netinfo: e36c1bb6df27ab84aa933679b3f5bbf9d180b18f
react-native-pdf: 4b5a9e4465a6a3b399e91dc4838eb44ddf716d1f
- react-native-ptt-module: e475c14b826a02906417eb0aa833d4ee9d3359d8
+ react-native-ptt-module: fd0a9eaa70d34a46254aae6eb208aae054e8c5dc
react-native-safe-area-context: 01158a92c300895d79dee447e980672dc3fb85a6
react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
react-native-sumo-sdk: 8a034fe724417d8c9465951630e229edef2f738f
| bump ptt version | bump ptt version
|
e6cffba08cb8404db32162e1745b2c7d9e8ad6f9 | --- .looper.multibranch.yml
@@ -38,7 +38,6 @@ envs:
global:
variables:
CI: true
- NO_FLIPPER: 1,
LOOPER_NODES: '((osx||stable_osx)&&!dualcore)'
GITHUB_TOKEN: "%{credentials.secret('GITHUB_TOKEN')}"
--- ios/BuildSupport/install-cocoapods.sh
@@ -33,4 +33,4 @@ echo "pod_path ${pod_path}"
ls -l ${pod_path}/pod
pod _${CCP_VER}_ --version
echo "pod install"
-pod _${CCP_VER}_ install --verbose
+NO_FLIPPER=1 pod _${CCP_VER}_ install --verbose
--- react-native.config.js
@@ -4,7 +4,7 @@ module.exports = {
android: {},
},
dependencies: {
- ...(process.env.NO_FLIPPER
+ ...(process.env.CI
? {'react-native-flipper': {platforms: {ios: null}}}
: {}),
},
| fix: remove flipper on looper pod install | fix: remove flipper on looper pod install
|
915a227509db5226a93588edb707041006169af4 | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/roster-mini-app",
- "version": "1.0.17",
+ "version": "1.0.17.1",
"private": false,
"main": "dist/index.js",
"files": [
@@ -89,7 +89,7 @@
"@walmart/react-native-shared-navigation": "1.0.2",
"@walmart/react-native-sumo-sdk": "2.6.0",
"@walmart/ui-components": "1.15.1",
- "@walmart/wmconnect-mini-app": "1.0.15",
+ "@walmart/wmconnect-mini-app": "1.0.16.1",
"babel-jest": "^29.2.1",
"chance": "^1.1.11",
"eslint": "8.22.0",
| updating version | updating version
|
fbcbb09e057eecfdd98d350a1388880ff7374579 | --- package-lock.json
@@ -5458,9 +5458,9 @@
"integrity": "sha512-O/Ws19nd/94JUqGJD/CQWBajvNo4VK8P/h1gxm1FHJBtVB0LqCXunVXRm02Wviix+uSAp7OBiS9sRWvhkvEmhQ=="
},
"@walmart/taskit-mini-app": {
- "version": "0.32.0-beta.6",
- "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.32.0-beta.6.tgz",
- "integrity": "sha512-EzKL8LRJd7FQOZ71kGlA4hsLPdiBAj4wuDmLL++TYJixSPG4mi5Q5BJU0BHEiADUxn44SWThVQBuPIYXVXjyaA=="
+ "version": "0.32.0-beta.7",
+ "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.32.0-beta.7.tgz",
+ "integrity": "sha512-b8YU9nLBZ2SqSG0Yj3547DMFmp+FnegKQ8Wv53f3QDcBclrftCIJLHEwDTjIM5+V7A+62NC/lSmjt2AWdfegSQ=="
},
"@walmart/time-clock-mini-app": {
"version": "0.13.0",
--- package.json
@@ -112,7 +112,7 @@
"@walmart/schedule-mini-app": "0.18.0",
"@walmart/settings-mini-app": "1.6.0",
"@walmart/shelfavailability-mini-app": "1.2.2",
- "@walmart/taskit-mini-app": "0.32.0-beta.6",
+ "@walmart/taskit-mini-app": "0.32.0-beta.7",
"@walmart/time-clock-mini-app": "0.13.0",
"@walmart/ui-components": "1.4.0-beta.8",
"@walmart/welcomeme-mini-app": "0.69.0",
| Taskit version update | Taskit version update
|
e93684b67926651b04561f06d468856793c0485b | --- package-lock.json
@@ -5439,9 +5439,9 @@
"integrity": "sha512-uCC2Hk4fRcAC49c4uuIpLpD3geWjG7uAQByH8ygekhQKPrijc5/F1/z+Tkt3zFQ88BlsE+ihQ6z3AWFzAyuNGw=="
},
"@walmart/profile-feature-app": {
- "version": "0.0.55",
- "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.0.55.tgz",
- "integrity": "sha512-2CE3xLCM4ZIpHL+sZdVEnoFXNW8qjseP1CSLVth9R+miE+tz6jipd1U0JD5ts8ayBZQvMqNTx9mPVA/4IBRxzg=="
+ "version": "0.0.56",
+ "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.0.56.tgz",
+ "integrity": "sha512-ObOGgf5AM/WdmHk2flIpgLrfmrkmjSawHEI3cC/pWw69l5t+ZTBuSgk/P/YhDioLnNTVmgpCd+w710v+bGsTYQ=="
},
"@walmart/push-to-talk-mini-app": {
"version": "1.8.9",
--- package.json
@@ -105,7 +105,7 @@
"@walmart/pay-stub-miniapp": "0.7.1",
"@walmart/payrollsolution_miniapp": "0.126.54",
"@walmart/price-changes-mini-app": "1.4.11",
- "@walmart/profile-feature-app": "0.0.55",
+ "@walmart/profile-feature-app": "0.0.56",
"@walmart/push-to-talk-mini-app": "1.8.9",
"@walmart/react-native-encrypted-storage": "1.1.3",
"@walmart/react-native-env": "^0.2.0",
| Bumped profile to 0.0.56 | Bumped profile to 0.0.56
|
b3e5bd626c1ea8c6b238a315bc9982cf44237317 | --- docs/docs/components/allspark foundation/_category_.json
@@ -3,6 +3,6 @@
"position": 1,
"link": {
"type": "generated-index",
- "description": "Indepth documentation on allspark foundation"
+ "description": "In-depth documentation on Allspark Foundation."
}
}
--- docs/docs/components/allspark foundation/clients/_category_.json
@@ -3,6 +3,6 @@
"position": 3,
"link": {
"type": "generated-index",
- "description": "Indepth documentation on allspark container clients."
+ "description": "Indepth documentation on allspark static container clients."
}
}
--- docs/docs/components/allspark foundation/migration guides/foundation-migration.md
@@ -19,3 +19,5 @@ Allspark Foundation is backwards compatible so migration can be done in phases.
* [Phase 6 - Optional Enhancements](./foundation-migration-phase6.md)
The [Allspark Feature Template](https://gecgithub01.walmart.com/store-systems-associate-tech-platform/feature-app-template-typescript) has completed all migration phases, so please reference it if you need an example.
+
+A Mini App Migration timeline [Confluence page](https://confluence.walmart.com/display/ALLSPARK/Allspark+Foundation+-+Mini+App+Migration+Timeline) has been created to track each mini app's migration progress. Please keep this page updated as your feature app completes each phase.
\ No newline at end of file
--- docs/docs/components/allspark foundation/services/_category_.json
@@ -3,6 +3,6 @@
"position": 8,
"link": {
"type": "generated-index",
- "description": "Indepth documentation on allspark foundation services."
+ "description": "Indepth documentation on allspark foundation dynamic container services."
}
}
--- docs/docs/getting-started.md
@@ -1,4 +1,25 @@
---
sidebar_position: 2
title: Getting Started
----
\ No newline at end of file
+custom_edit_url: null
+---
+
+# Getting Started
+
+Allspark Foundation is currently being used in [allspark-core](https://gecgithub01.walmart.com/allspark/allspark-core) and several mini apps.
+
+## Pre-requisites for Allspark Foundation
+See the [Introduction](./components/allspark%20foundation/foundation-intro.md) page for Foundation.
+
+## Pre-requisites for Allspark Core
+- Node v20+
+- java v17+
+- Yarn v4+ via corepack [(Yarn migration guide)](https://confluence.walmart.com/display/ALLSPARK/Migration+Guide+-+Yarn)
+- Xcode
+- Android Studio
+- Cocoapods
+
+
+For migrating a feature app to Foundation, read the [migration documentation](./components/allspark%20foundation/migration%20guides/foundation-migration.md). There are six phases in total, however the final phase is optional.
+
+For creating a new feature app, see the [feature app template](https://gecgithub01.walmart.com/store-systems-associate-tech-platform/feature-app-template).
\ No newline at end of file
--- docs/docs/introduction.md
@@ -1,4 +1,11 @@
---
sidebar_position: 1
title: Introduction
----
\ No newline at end of file
+custom_edit_url: null
+---
+
+The Allspark Foundation was designed to define and enforce stricter standards for app creation, define implementations for static and dynamic common functionality, improve standalone mini app testing, be backwards compatible, and define standards for sharing capabilites between mini apps without direct dependencies. See the [Foundation ADR](https://confluence.walmart.com/display/ALLSPARK/Allspark+-+Foundation) for more details on its design.
+
+It is meant to eventually replace several [deprecated libraries](./components/allspark%20foundation/core/foundation-whats-changing.md). See the [migration docs](./components/allspark%20foundation/migration%20guides/foundation-migration.md) for further details on migrating feature apps to Foundation.
+
+See [Getting Started](./getting-started.md) for a guide to navigating this site.
\ No newline at end of file
| Intro, getting started updates. | Intro, getting started updates.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.