commit_hash stringlengths 40 40 | input stringlengths 13 7.99k | output stringlengths 5 155 | full_message stringlengths 6 8.96k |
|---|---|---|---|
e0b046c8938eddf95c0ee0c82e247cd1189652f6 | --- graphql.yml
@@ -1,6 +1,9 @@
schemaVersion: "1.0.0"
enableGating: true
teamRostersProductId: 1824
+notify:
+ slack:
+ channelName: "smdv-miniapp"
applications:
- name: "ROSTER-MINIAPP"
applicationKey: "ROSTER-MINIAPP"
| Addressing comments | Addressing comments
|
e523034afe148f887fb635f0f4f5bbb433a93b57 | --- ios/Podfile.lock
@@ -1200,7 +1200,8 @@ SPEC CHECKSUMS:
react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a
react-native-image-picker: 4bc9ed38c8be255b515d8c88babbaf74973f91a8
react-native-image-resizer: d9fb629a867335bdc13230ac2a58702bb8c8828f
- react-native-logger: 23f2b2ed3622b45613a887bf3bdeaa7e5dec4976 react-native-loudness: 38527e7e42c3be3e4ea3d8aace2621a8eb9cafda
+ react-native-logger: 23f2b2ed3622b45613a887bf3bdeaa7e5dec4976
+ react-native-loudness: 38527e7e42c3be3e4ea3d8aace2621a8eb9cafda
react-native-maps: 085f614cf14d3637b2048bb9752da5b1c27c2886
react-native-netinfo: f80db8cac2151405633324cb645c60af098ee461
react-native-pager-view: 592421df0259bf7a7a4fe85b74c24f3f39905605
| cleaned up podfile conflict | cleaned up podfile conflict
|
0d43941f73bf3fa413d35f23222142df36fdb7e1 | --- package.json
@@ -80,7 +80,7 @@
"@walmart/allspark-neon-core": "0.1.31",
"@walmart/amp-mini-app": "1.1.48",
"@walmart/ask-sam-chat-components": "^0.2.7",
- "@walmart/ask-sam-mini-app": "1.15.2",
+ "@walmart/ask-sam-mini-app": "1.15.3",
"@walmart/attendance-mini-app": "0.190.6",
"@walmart/compass-sdk-rn": "4.2.0",
"@walmart/config-components": "4.2.1",
| SMBLV-4870: bump ask sam version | SMBLV-4870: bump ask sam version
|
2885090318351371228a45f2cf7f1ac91e05e9e8 | --- docs/docs/allspark ecosystem/allspark-http-requests.md
@@ -4,10 +4,10 @@ custom_edit_url: null
---
## Overview
-AllSpark is using the HttpClientProvider component to configure http requests. The underlying implementation is a wrapper around axios that provides extra utility to clone from a common default configured HttpClient. See the [HTTP docs](../allspark%20foundation/clients/foundation-http.md) for more usage guidance.
+AllSpark is using the HttpClient component to configure http requests. The underlying implementation is a wrapper around axios that provides extra utility to clone from a common default configured HttpClient. See the [HTTP docs](../allspark%20foundation/clients/foundation-http.md) for more usage guidance.
## Core Configuration
-The allspark-core container app is responsible for configuring the HttpClientProvider. Core will integrate with an authentication provider (such as SSO) to get an updated access token for your API calls that go through API proxy. Core will also set the following headers on each request.
+The allspark-core container app is responsible for configuring the HttpClient. Core will integrate with an authentication provider (such as SSO) to get an updated access token for your API calls that go through API proxy. Core will also set the following headers on each request.
| Header | Value | Description
| - | - | -
--- docs/docs/allspark foundation/clients/foundation-graphQL.md
@@ -5,7 +5,8 @@ custom_edit_url: null
---
# GraphQL Client
-The `AllsparkGraphQLClient` provides a simple, unified interface for making GraphQL requests. It is an extension of [Apollo Client](https://www.apollographql.com/docs/react/) and its underlying fetch implementation uses the `AllsparkHttpClient`.
+The `AllsparkGraphQLClient` provides a simple, unified interface for making GraphQL requests. It is an extension of [Apollo Client](https://www.apollographql.com/docs/react/) and its underlying fetch implementation uses the `AllsparkHttpClient`. For more information about the use of GraphQL in allspark-core, see [this page.](../../allspark%20ecosystem/allspark-graphql-athena.md)
+
## How to Use the Client in a Feature App
--- docs/docs/allspark foundation/clients/foundation-http.md
@@ -5,7 +5,8 @@ custom_edit_url: null
---
# HTTP Client
-The `AllsparkHttpClient` provides a simple, unified interface for making HTTP requests. It is an extension of [Axios](https://axios-http.com/) and can create scoped clients for use in feature apps.
+The `AllsparkHttpClient` provides a simple, unified interface for making HTTP requests. It is an extension of [Axios](https://axios-http.com/) and can create scoped clients for use in feature apps. For more information about the HTTP requests in allspark-core, see [this page.](../../allspark%20ecosystem/allspark-http-requests.md)
+
## How to Use the Client in a Feature App
--- docs/docs/allspark foundation/clients/foundation-navigation.md
@@ -9,6 +9,8 @@ The Allspark Navigation Client provides a simple interface for navigating betwee
It's an extension of [react-navigation](https://reactnavigation.org/) and [react-native-modalfy](https://colorfy-software.gitbook.io/react-native-modalfy) that provides a single interface and handles custom Allspark navigation features.
+For more information about navigation in allspark-core, see [this page.](../../allspark%20ecosystem/allspark-navigation.md)
+
## Navigation Structure
An `AllsparkContainer` has ultimate control over the navigation structure of the app. It can create navigation stacks and screens directly with react-navigation components.
--- docs/docs/allspark foundation/clients/foundation-notification.md
@@ -10,6 +10,8 @@ The Allspark Notification Client is an extension of the Sumo SDK (@walmart/react
It connects Sumo calls to the Allspark Redux Store, manages event listeners for feature apps, and handles notification permissions.
+For more information about push notifications in allspark-core, see [this page.](../../allspark%20ecosystem/allspark-push-notifications.md)
+
## Events
### `onForegroundNotification`
--- docs/docs/allspark foundation/clients/foundation-translation.md
@@ -5,7 +5,7 @@ custom_edit_url: null
---
# Translation Client
-The Allspark Translation Client is an extension of [i18next](https://www.i18next.com/) that adds functionality to create scoped feature clients and configure at runtime.
+The Allspark Translation Client is an extension of [i18next](https://www.i18next.com/) that adds functionality to create scoped feature clients and configure at runtime. For more information about translations in allspark-core, see [this page.](../../allspark%20ecosystem/allspark-translation.md)
## How to Use in a Feature App/Container App
--- docs/docs/allspark foundation/foundation-environment.md
@@ -6,7 +6,7 @@ custom_edit_url: null
# Environment
-AllsparkEnvironment manages configurations that change based on the environment type (dev, beta, prod, etc). These configurations can include API endpoints, feature flags, etc.
+AllsparkEnvironment manages configurations that change based on the environment type (dev, beta, prod, etc). These configurations can include API endpoints, feature flags, etc. For more information about the Environment in allspark-core, see [this page.](../allspark%20ecosystem/allspark-build-environments.md)
An AllsparkContainer *initializes* the environment.
--- docs/docs/allspark foundation/foundation-redux.md
@@ -5,7 +5,7 @@ custom_edit_url: null
---
# Redux Store
-This is the Redux store for the Allspark Foundation. It is an extension of the [Redux Toolkit](https://redux-toolkit.js.org/) store with default middleware and reducers.
+This is the Redux store for the Allspark Foundation. It is an extension of the [Redux Toolkit](https://redux-toolkit.js.org/) store with default middleware and reducers. For more information about redux in allspark-core, see [this page.](../allspark%20ecosystem/allspark-shared-redux.md)
## Usage
--- docs/docs/allspark foundation/services/foundation-logger.md
@@ -5,7 +5,7 @@ custom_edit_url: null
---
# Logger Service
-The Allspark Logger Service is a dynamic container service, meaning it's defined by the container app. It provides a set of APIs for logging at different log levels (debug, info, warn, error).
+The Allspark Logger Service is a dynamic container service, meaning it's defined by the container app. It provides a set of APIs for logging at different log levels (debug, info, warn, error). For more information about logging in allspark-core, see [this page.](../../allspark%20ecosystem/allspark-logging.md)
## Container Usage
--- docs/docs/allspark foundation/services/foundation-telemetry.md
@@ -5,7 +5,7 @@ custom_edit_url: null
---
# Telemetry Service
-The Allspark Telemetry Service is a dynamic container service, meaning it's defined by the container app. It provides a set of APIs for logging events, errors, and crashes.
+The Allspark Telemetry Service is a dynamic container service, meaning it's defined by the container app. It provides a set of APIs for logging events, errors, and crashes. For more information about telemetry in allspark-core, see [this page.](../../allspark%20ecosystem/allspark-user-metrics.md)
## Container Usage
| docs: linking ecosystem and foundation where relevant | docs: linking ecosystem and foundation where relevant
|
b10dbfb2c79b61b6786103c7dc111eb855962178 | --- __tests__/navigation/SideMenuContentTest.tsx
@@ -0,0 +1,71 @@
+import React from 'react';
+import {create, act, ReactTestRenderer} from 'react-test-renderer';
+
+jest.mock('react-redux', () => ({
+ useSelector: jest.fn(),
+}));
+jest.mock('../../src/auth', () => ({
+ connectedSSO: {
+ signOut: jest.fn(),
+ },
+}));
+
+jest.mock('@walmart/ui-components/containers', () => ({
+ GlobalNavigation: () => 'GlobalNavigation',
+}));
+
+import {DrawerActions} from '@react-navigation/native';
+
+import {connectedSSO} from '../../src/auth';
+import {useSelector} from 'react-redux';
+import {SideMenuContent} from '../../src/navigation/SideMenuContent';
+import {SSOUser} from '../../src/auth/ssoPingFedType';
+
+describe('SideMenuContent', () => {
+ it('renders', () => {
+ const props = {
+ navigation: {
+ navigate: jest.fn(),
+ dispatch: jest.fn(),
+ },
+ };
+
+ const mockUseSelector = useSelector as jest.Mock;
+
+ mockUseSelector.mockReturnValueOnce({user: null});
+
+ let component: ReactTestRenderer;
+ act(() => {
+ component = create(<SideMenuContent {...props} />);
+ });
+ expect(component.toJSON()).toMatchSnapshot();
+
+ const user: SSOUser = {
+ userId: 'testUser',
+ siteId: '100',
+ domain: 'homeoffice',
+ countryCode: 'US',
+ division: '1',
+ employeeType: 'h',
+ win: '12345',
+ fullTimePartTime: 'f',
+ clockStatus: '1',
+ };
+ mockUseSelector.mockReturnValueOnce({user});
+
+ act(() => {
+ component.update(<SideMenuContent {...props} />);
+ });
+ expect(component.toJSON()).toMatchSnapshot();
+
+ const globalNav = component.root.findByProps({testID: 'globalNav'});
+ globalNav.props.onDrawerClose();
+ expect(props.navigation.dispatch).toHaveBeenCalledWith(
+ DrawerActions.closeDrawer(),
+ );
+ globalNav.props.onSignOut();
+ expect(connectedSSO.signOut).toHaveBeenCalledWith(expect.any(String), true);
+ globalNav.props.onDndToggle();
+ // no implementation for now
+ });
+});
--- __tests__/navigation/__snapshots__/SideMenuContentTest.tsx.snap
@@ -0,0 +1,5 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SideMenuContent renders 1`] = `"GlobalNavigation"`;
+
+exports[`SideMenuContent renders 2`] = `"GlobalNavigation"`;
--- package.json
@@ -102,8 +102,7 @@
"collectCoverageFrom": [
"<rootDir>/src/**/*.{js,jsx,ts,tsx}",
"!<rootDir>/src/navigation/Navigation.tsx",
- "!<rootDir>/src/navigation/NavigationStyle.ts",
- "!<rootDir>/src/navigation/SideMenuContent.tsx"
+ "!<rootDir>/src/navigation/NavigationStyle.ts"
],
"coverageThreshold": {
"global": {
--- src/navigation/SideMenuContent.tsx
@@ -1,54 +1,73 @@
import React from 'react';
-import {
- Text,
- TouchableOpacity,
- StyleProp,
- ViewStyle,
- TextStyle,
-} from 'react-native';
+import {DrawerActions} from '@react-navigation/native';
import {
DrawerContentComponentProps,
DrawerContentOptions,
} from '@react-navigation/drawer';
-import {SafeAreaView} from 'react-native-safe-area-context';
import {useSelector} from 'react-redux';
import {connectedSSO} from '../auth';
-import { GlobalNavigation } from "@walmart/ui-components/containers";
+import {
+ GlobalNavigation,
+ GlobalNavNavigate,
+} from '@walmart/ui-components/containers';
+import {ClockStatus} from '../types/clockStatus';
+import {GlobalState} from '@walmart/redux-store';
const activityName = 'MainActivity';
-const menuContainerStyle: StyleProp<ViewStyle> = {flex: 1};
+const config = [
+ {
+ menuType: 'SUBMENU',
+ icon: 'settings',
+ title: 'Settings',
+ enabled: true,
+ action: {
+ type: 'NAVIGATE',
+ value: 'Setting',
+ },
+ },
+ {
+ menuType: 'SUBMENU',
+ icon: 'feedback',
+ title: 'Give Feedback',
+ enabled: true,
+ action: {
+ type: 'NAVIGATE',
+ value: 'Feedback',
+ },
+ },
+ {
+ menuType: 'TOGGLE',
+ icon: 'team',
+ title: 'Do Not Disturb',
+ enabled: true,
+ action: {
+ type: 'Toggle',
+ value: 'Disturb',
+ },
+ },
+];
+
export const SideMenuContent: React.FC<DrawerContentComponentProps<
DrawerContentOptions
->> = () => {
- const {user} = useSelector((state: any) => state.user);
+>> = (props) => {
+ const {navigation} = props;
+ const {user} = useSelector((state: GlobalState) => state.user);
return (
- <SafeAreaView style={menuContainerStyle}>
- <GlobalNavDefault
- onSignOut={() => connectedSSO.signOut(activityName, true)}
- clockIn={true}
- dndSwitch={false}
- onPress={() => console.log('pressed')}
- toggleDndSwitch={() => {}}
- menuList={[
- {
- menuType: 'NAVIGATION',
- title: 'Settings',
- icon: 'settings',
- },
- {
- menuType: 'NAVIGATION',
- title: 'Feedback',
- icon: 'feedback',
- },
- {
- menuType: 'TOGGLE',
- title: 'Do Not Disturb',
- icon: 'team-filled',
- },
- ]}
- />
- </SafeAreaView>
+ <GlobalNavigation
+ testID='globalNav'
+ showDefaultNav
+ clockIn={user?.clockStatus === ClockStatus.clockedIn}
+ onDrawerClose={() => navigation.dispatch(DrawerActions.closeDrawer())}
+ globalNavConfig={config}
+ user={user || {}}
+ siteId={user?.siteId || 0}
+ onSignOut={() => connectedSSO.signOut(activityName, true)}
+ onDndToggle={() => {}}
+ navigate={navigation.navigate as GlobalNavNavigate}
+ baseURL=''
+ appId=''
+ />
);
};
--- src/types/clockStatus.ts
@@ -0,0 +1,5 @@
+export enum ClockStatus {
+ clockedIn = '1',
+ clockedOut = '2',
+ indeterminate = '9',
+}
--- src/types/ui-components.d.ts
@@ -1,23 +1,29 @@
declare module '@walmart/ui-components/containers' {
import type {FC} from 'react';
+ export type GlobalNavNavigate = (
+ route: string,
+ params?: Record<string, any> | undefined,
+ ) => void;
+
interface GlobalNavigationProps {
- navigate: (route: string, params?: Record<string, any>) => void;
- subMenuComponent: FC;
- subMenuItem: FC;
- onClockIn: () => void;
+ testID?: string;
+ navigate?: GlobalNavNavigate;
+ subMenuComponent?: FC;
+ subMenuItem?: FC;
+ onClockIn?: () => void;
onDrawerClose: () => void;
- onDndToggle: () => void;
- user: object;
- globalNavConfig: object;
+ onDndToggle?: () => void;
+ user?: object;
+ globalNavConfig?: object;
baseURL: string;
siteId: number | string;
appId: string;
- avatar: string | FC;
- clockIn: boolean;
- showDefaultNav: boolean;
+ avatar?: string | FC;
+ clockIn?: boolean;
+ showDefaultNav?: boolean;
onSignOut: () => void;
- onClockOut: () => void;
+ onClockOut?: () => void;
}
export const GlobalNavigation: FC<GlobalNavigationProps>;
| using global nav | using global nav
|
b02f9671ff56421dbf7df44ba612e61ae811bbce | --- __tests__/settings/versions/utilsTest.ts
@@ -5,6 +5,15 @@ import {
getVersionData,
} from '../../../src/settings/versions/utils';
+jest.mock('../../../package.json', () => ({
+ dependencies: {
+ '@walmart/ask-sam-mini-app': '1.0.0',
+ '@walmart/unknown-mini-app': '2.0.0',
+ '@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',
+ },
+}));
+
describe('shouldBeListed', () => {
it('returns true for listed dependency', () => {
expect(shouldBeListed('@walmart/ask-sam-mini-app')).toEqual(true);
@@ -15,11 +24,21 @@ describe('shouldBeListed', () => {
});
});
-test('createPackageDetails', () => {
- expect(createPackageDetails('@walmart/ask-sam-mini-app')).toEqual({
- packageName: '@walmart/ask-sam-mini-app',
- title: 'appNames.@walmart/ask-sam-mini-app',
- version: expect.any(String),
+describe('createPackageDetails', () => {
+ it('should return details for regularly listed dependency', () => {
+ expect(createPackageDetails('@walmart/ask-sam-mini-app')).toEqual({
+ packageName: '@walmart/ask-sam-mini-app',
+ title: 'appNames.@walmart/ask-sam-mini-app',
+ version: '1.0.0',
+ });
+ });
+
+ it('should extract details for patched dependency', () => {
+ expect(createPackageDetails('@walmart/profile-feature-app')).toEqual({
+ packageName: '@walmart/profile-feature-app',
+ title: 'appNames.@walmart/profile-feature-app',
+ version: '1.138.3-patch',
+ });
});
});
--- src/settings/versions/utils.ts
@@ -56,10 +56,19 @@ export const shouldBeListed = (name: string) =>
export const createPackageDetails = (name: string) => {
const title = i18n.t(`appNames.${name}`);
+ // Version as listed in the package.json
+ let version = ALL_DEPENDENCIES[name];
+
+ // If it's a patch version, extract the version number from it
+ if (version?.includes('patch:')) {
+ const patch = version.match(/npm-(\d+\.\d+\.\d+)/)?.[1];
+ version = patch ? `${patch}-patch` : 'N/A';
+ }
+
return {
packageName: name,
title,
- version: ALL_DEPENDENCIES[name],
+ version,
};
};
| fix: patch version not correctly extracted for display on version list | fix: patch version not correctly extracted for display on version list
|
f3dcca4b0446d63e5b3389d0e97dc10008c2588d | --- docs/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [2.15.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.14.2...v2.15.0) (2025-03-07)
+
+
+### Features
+
+* **ui:** update roster widget schedule count ([4258ff5](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/4258ff5ad64166cf121bb187b70ef11549684861))
+
## [2.14.2](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.14.1...v2.14.2) (2025-03-03)
--- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/roster-mini-app",
- "version": "2.14.2",
+ "version": "2.15.0",
"main": "dist/index.js",
"files": [
"dist"
| chore(release): 2.15.0 [skip ci] | chore(release): 2.15.0 [skip ci]
# [2.15.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.14.2...v2.15.0) (2025-03-07)
### Features
* **ui:** update roster widget schedule count ([4258ff5](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/4258ff5ad64166cf121bb187b70ef11549684861))
|
5bf4388c845a2dfd8cf78571db9169d5b4f3f261 | --- android/app/build.gradle
@@ -13,6 +13,7 @@ plugins {
import com.android.build.OutputFile
// import org.apache.tools.ant.taskdefs.condition.Os //++
+/*
* The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
* and bundleReleaseJsAndAssets).
* These basically call `react-native bundle` with the correct arguments during the Android build
@@ -86,7 +87,6 @@ import com.android.build.OutputFile
* extraPackagerArgs: []
* ]
*/
-
project.ext.react = [
enableHermes: true, // clean and rebuild if changing
]
@@ -327,7 +327,7 @@ dependencies {
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
- implementation 'com.google.firebase:firebase-messaging:21.0.1'
+ // implementation 'com.google.firebase:firebase-messaging:21.0.1'
// implementation "com.google.dagger:hilt-android:2.34.1-beta"
// kapt "com.google.dagger:hilt-compiler:2.34.1-beta"
--- android/build.gradle
@@ -6,17 +6,22 @@ buildscript {
minSdkVersion = 26
compileSdkVersion = 31
targetSdkVersion = 31
- if (System.properties['os.arch'] == "aarch64") {
+
+ kotlinVersion = "1.6.0"
+ kotlin_version = "1.6.0"
+ // androidXCore = "1.6.0"
+ // androidMapsUtilsVersion = "2.3.0"
+
+ playServicesVersion = "17.0.0"
+ googlePlayServicesVersion = "17.0.0"
+
+ if (System.properties['os.arch'] == "aarch64") {
// For M1 Users we need to use the NDK 24 which added support for aarch64
ndkVersion = "24.0.8215888"
} else {
// Otherwise we default to the side-by-side NDK version from AGP.
ndkVersion = "21.4.7075529"
}
- googlePlayServicesVersion = "17.0.0"
- androidXCore = "1.6.0"
- playServicesVersion = "17.0.0"
- androidMapsUtilsVersion = "2.3.0"
}
repositories {
google()
@@ -31,12 +36,12 @@ buildscript {
classpath("de.undercouch:gradle-download-task:5.0.1")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
+ classpath 'com.google.gms:google-services:4.3.3'
+ classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.0'
+ classpath 'com.google.firebase:perf-plugin:1.4.1'
+ classpath 'com.walmart.ssmp:android-signing:1.0.9'
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// classpath "com.google.dagger:hilt-android-gradle-plugin:2.34.1-beta"
- // classpath 'com.google.gms:google-services:4.3.3'
- // classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.0'
- // classpath 'com.google.firebase:perf-plugin:1.4.1'
- // classpath 'com.walmart.ssmp:android-signing:1.0.9'
- // classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
// classpath "io.realm:realm-gradle-plugin:10.8.0"
}
}
@@ -70,3 +75,9 @@ allprojects {
maven { url 'https://www.jitpack.io' }
}
}
+
+subprojects { subproject ->
+ if(project['name'] == 'walmart_react-native-logger'){
+ project.configurations { compile { } }
+ }
+}
--- android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://repository.walmart.com/repository/gradle_distros/gradle-7.2.1-all.zip
+distributionUrl=https\://repository.walmart.com/repository/gradle_distros/gradle-7.3.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
--- src/navigation/UserRootNav.tsx
@@ -3,7 +3,6 @@ import {useDispatch, useSelector} from 'react-redux';
import {UserSelectors} from '@walmart/redux-store';
import {UserEmployeeType} from '@walmart/core-services/User';
-import {addMiniAppI18nResources} from '../translations/utils';
import {StartupActionCreators} from '../startup/StartupRedux';
import {AssociateHallway} from './AssociateHallwayNav';
import {PreHireHallway} from './PreHireHallwayNav';
@@ -21,7 +20,6 @@ export const UserRootNav = () => {
useEffect(() => {
dispatch(StartupActionCreators.loadMiniApps());
- addMiniAppI18nResources();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
--- src/startup/index.ts
@@ -12,6 +12,7 @@ import {
import {AuthTypes, UserTypes} from '@walmart/redux-store';
import {NetworkTypes} from '@walmart/core-services/Network';
+import {addMiniAppI18nResources} from '../translations/utils';
import {initSagas} from '../redux/utils';
import {resetTo} from '../redux/SharedSagas';
import {pinPromptFlow} from '../PinAccess/PinCodeSagas';
@@ -36,6 +37,13 @@ export function* captureMissedMiniAppEvents(): any {
// Dispatch missed actions / emit missed events
const networkType = yield select(getNetworkType);
+ // These mini apps have an issue with translations listeners not being setup
+ // by the time we emit the initialized event.
+ require('@walmart/allspark-health-survey-mini-app');
+ require('@walmart/allspark-home-mini-app');
+
+ yield call(addMiniAppI18nResources);
+
yield all([
// For those mini apps expecting network actions to init services
put({type: NetworkTypes.UPDATE_NETWORK_TYPE, networkType}),
| android build fix. language resource late init fix | android build fix. language resource late init fix
|
ca1d01b077c1fa329db67d0a6b925ac6bee7f568 | --- package.json
@@ -92,7 +92,7 @@
"@walmart/avp-shared-library": "0.7.3",
"@walmart/backroom-mini-app": "1.2.6",
"@walmart/calling-mini-app": "0.3.5",
- "@walmart/checkout-mini-app": "3.21.0",
+ "@walmart/checkout-mini-app": "3.22.0",
"@walmart/compass-sdk-rn": "5.19.13",
"@walmart/config-components": "4.4.1",
"@walmart/copilot-mini-app": "3.92.14",
--- yarn.lock
@@ -5868,9 +5868,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/checkout-mini-app@npm:3.21.0":
- version: 3.21.0
- resolution: "@walmart/checkout-mini-app@npm:3.21.0"
+"@walmart/checkout-mini-app@npm:3.22.0":
+ version: 3.22.0
+ resolution: "@walmart/checkout-mini-app@npm:3.22.0"
dependencies:
"@stomp/stompjs": "npm:^7.0.0"
cpc-input: "npm:^1.7.28"
@@ -5915,7 +5915,7 @@ __metadata:
react-native-wm-telemetry: ">=6"
react-redux: ^8.1.3
redux: ^4.0.5
- checksum: 10c0/7806434eeb38782b267ce7714051a7cf1b7d2faa1d884a322c81475782ec830d2fb855ea81cb0667807dea22696dea4a00605899e69eaa0ba67ee5d6737d60fe
+ checksum: 10c0/ec22cfe4dc40d516dbd2ebcca7c9d95753ec1b51e2af2b23fd2b2965f1a0f062c5d56385a03bd2d6cae9a484128f53e3ce1b4bf6fc19c12897f1210bc4a5cc87
languageName: node
linkType: hard
@@ -7889,7 +7889,7 @@ __metadata:
"@walmart/avp-shared-library": "npm:0.7.3"
"@walmart/backroom-mini-app": "npm:1.2.6"
"@walmart/calling-mini-app": "npm:0.3.5"
- "@walmart/checkout-mini-app": "npm:3.21.0"
+ "@walmart/checkout-mini-app": "npm:3.22.0"
"@walmart/compass-sdk-rn": "npm:5.19.13"
"@walmart/config-components": "npm:4.4.1"
"@walmart/copilot-mini-app": "npm:3.92.14"
| CO mini app hide unassign link | CO mini app hide unassign link
|
7db24261545880a56074cce217e40537663842a8 | --- container/scripts/runWithVariablePrompt.ts
@@ -901,13 +901,13 @@ if (nonInteractive) {
METRO_PORT: finalMetroPort,
...(device && device.platform === 'ios'
? {
- EXPO_SIMULATOR_DEVICE_TYPE: device.name,
- EXPO_SIMULATOR_ID: device.id,
- SIMULATOR_UDID: device.id,
- TARGET_DEVICE_UDID: device.id,
- EXPO_PORT: finalMetroPort,
- REACT_NATIVE_PACKAGER_PORT: finalMetroPort,
- }
+ EXPO_SIMULATOR_DEVICE_TYPE: device.name,
+ EXPO_SIMULATOR_ID: device.id,
+ SIMULATOR_UDID: device.id,
+ TARGET_DEVICE_UDID: device.id,
+ EXPO_PORT: finalMetroPort,
+ REACT_NATIVE_PACKAGER_PORT: finalMetroPort,
+ }
: device && device.platform === 'android'
? {EXPO_ANDROID_DEVICE: device.id}
: {}),
--- container/web-shims/allsparkStepUpAuth.ts
@@ -13,7 +13,7 @@ export const stepUpAuthSlice = {
};
export const handleProtectedResource = (payload: any) => {
- console.log(`[Dummy handleProtectedResource] Called with payload:`, payload);
+ console.log('[Dummy handleProtectedResource] Called with payload:', payload);
// Simulate handling protected resources
if (payload && payload.currentRoute) {
@@ -22,7 +22,7 @@ export const handleProtectedResource = (payload: any) => {
);
} else {
console.warn(
- `[Dummy handleProtectedResource] No route information provided in payload.`
+ '[Dummy handleProtectedResource] No route information provided in payload.'
);
}
--- container/web-shims/encryptedStorage.ts
@@ -17,7 +17,7 @@ const EncryptedStorage = {
},
async clear(): Promise<void> {
- console.log(`[Dummy EncryptedStorage] Clearing all items.`);
+ console.log('[Dummy EncryptedStorage] Clearing all items.');
Object.keys(storage).forEach(key => delete storage[key]);
},
};
| feat: update the container | feat: update the container
|
db67cb83d4d813a5cbdf97e11bacabf5fba72967 | --- package-lock.json
@@ -4636,9 +4636,9 @@
}
},
"@walmart/welcomeme-mini-app": {
- "version": "0.66.0",
- "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.66.0.tgz",
- "integrity": "sha512-GTIQUNN7e/iMRwOphMocZ1112vWR4cPJqUwqipqlfBXmM5qxXxn4koTAEDumjjmS8n8xcxZAjjlvHKOjopEYsw=="
+ "version": "0.68.0",
+ "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.68.0.tgz",
+ "integrity": "sha512-trpCDBBI38zrrwzkSBUlICOiMEnNI9/rVnfQG7NQ1IsIeRk0KEd+e1dN4BOHpLJlvAcOpuf0WJmM4q1EBI4WxA=="
},
"@walmart/wfm-ui": {
"version": "0.2.14",
@@ -9434,7 +9434,7 @@
"indent-string": {
"version": "3.2.0",
"resolved": "https://npme.walmart.com/indent-string/-/indent-string-3.2.0.tgz",
- "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+ "integrity": "sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==",
"dev": true
},
"inflight": {
--- package.json
@@ -104,7 +104,7 @@
"@walmart/taskit-mini-app": "0.30.0",
"@walmart/time-clock-mini-app": "0.5.3",
"@walmart/ui-components": "1.4.0-rc.0",
- "@walmart/welcomeme-mini-app": "0.66.0",
+ "@walmart/welcomeme-mini-app": "0.68.0",
"@walmart/wfm-ui": "0.2.14",
"axios-cache-adapter": "2.7.3",
"crypto-js": "^3.3.0",
| build: WelcomeMe v0.68.0 | build: WelcomeMe v0.68.0
|
d1a32abbd5cf1a4c11131a942562d2a02426fb8e | --- packages/allspark-http-client/src/HttpClient.ts
@@ -364,7 +364,7 @@ class HttpClient extends Axios implements IHttpClient {
/**
* @deprecated Use httpClient.clones instead
*/
- public get cloneInstanceMap() {
+ public get clonedInstanceMap() {
return this.clones;
}
| fix: clone instance map backwards compatability fix | fix: clone instance map backwards compatability fix
|
ee73f85c51c763ddb7b2c3ba51b456299fc64cbc | --- packages/allspark-foundation/src/Container/redux.ts
@@ -4,6 +4,7 @@ import {
generateSelectorsForSlice,
} from '../Redux/utils';
import { InferActionTypes } from '../Redux/types';
+import { LibraryInfo } from './types';
export type ContainerState = {
name: string;
@@ -11,6 +12,8 @@ export type ContainerState = {
isSafeForFeatures: boolean;
activeSetupType: string | null;
activeFlowType: string | null;
+ version: string | null;
+ libraries: LibraryInfo[];
};
const INITIAL_STATE: ContainerState = {
@@ -19,6 +22,8 @@ const INITIAL_STATE: ContainerState = {
isSafeForFeatures: false,
activeSetupType: null,
activeFlowType: null,
+ version: null,
+ libraries: [],
};
export const containerSlice = createSlice({
@@ -28,6 +33,12 @@ export const containerSlice = createSlice({
SET_CONTAINER: (state, action: PayloadAction<string>) => {
state.name = action.payload;
},
+ SET_VERSION: (state, action: PayloadAction<string>) => {
+ state.version = action.payload;
+ },
+ SET_LIBRARIES: (state, action: PayloadAction<LibraryInfo[]>) => {
+ state.libraries = action.payload;
+ },
STARTUP_BEGIN: (state) => {
state.isStartingUp = true;
},
--- packages/allspark-foundation/src/Container/types.ts
@@ -117,3 +117,11 @@ export const CONTAINER_EVENTS_TYPES = [
'onPreRegister',
'onSetup',
] as const;
+
+/**
+ * Information on node module libraries being used
+ */
+export type LibraryInfo = {
+ name: string;
+ version: string;
+};
--- packages/allspark-foundation/src/Environment/client.ts
@@ -14,7 +14,6 @@ import {
EnvironmentDerivedValue,
EnvironmentType,
InitializeEnvironmentConfig,
- LibraryInfo,
} from './types';
/**
@@ -104,15 +103,6 @@ export class EnvironmentClient<E extends BaseAllsparkEnvironment> {
this._resolveEnvironment();
};
- /**
- * Set the library information for the current environment
- */
- public setLibraries = (libraries: LibraryInfo[]) => {
- AllsparkReduxStore.dispatch(
- EnvironmentActionCreators.SET_LIBRARIES(libraries)
- );
- };
-
/**
* Extends the environment configuration with the provided configuration.
* @deprecated Environment should not need to be extended. An AllsparkContainer will initialize the environment.
--- packages/allspark-foundation/src/Environment/hooks.ts
@@ -6,7 +6,6 @@ import {
BaseAllsparkEnvironment,
EnvironmentConfigMap,
InferEnvironmentFromMap,
- LibraryInfo,
} from './types';
/**
@@ -16,9 +15,7 @@ import {
* env.env // 'local' | 'dev' | 'beta' | 'prod'
*/
export const useEnvironment = <T extends BaseAllsparkEnvironment>() => {
- return useSelector(EnvironmentSelectors.getState) as T & {
- libraries: LibraryInfo[];
- };
+ return useSelector(EnvironmentSelectors.getState) as T;
};
/**
--- packages/allspark-foundation/src/Environment/redux.ts
@@ -4,11 +4,9 @@ import {
generateSelectorsForSlice,
} from '../Redux/utils';
import { InferActionTypes } from '../Redux/types';
-import { BaseAllsparkEnvironment, LibraryInfo } from './types';
+import { BaseAllsparkEnvironment } from './types';
-export type EnvironmentState = BaseAllsparkEnvironment & {
- libraries: LibraryInfo[];
-};
+export type EnvironmentState = BaseAllsparkEnvironment;
export const environmentSlice = createSlice({
name: 'environment',
@@ -24,9 +22,6 @@ export const environmentSlice = createSlice({
UPDATE: (state, action: PayloadAction<BaseAllsparkEnvironment>) => {
return { ...action.payload, libraries: state.libraries || [] }; // must return value to override state completely
},
- SET_LIBRARIES: (state, action: PayloadAction<LibraryInfo[]>) => {
- state.libraries = action.payload;
- },
},
});
--- packages/allspark-foundation/src/Environment/types.ts
@@ -5,14 +5,6 @@ import { PartialBy, RecursivePartial } from '@walmart/allspark-utils';
*/
export type EnvironmentType = 'dev' | 'prod' | 'teflon' | 'local' | 'beta';
-/**
- * Information on node module libraries being used
- */
-export type LibraryInfo = {
- name: string;
- version: string;
-};
-
/**
* Base environment for Allspark.
*/
| refactor: move library version data from environment to container redux. add container version field | refactor: move library version data from environment to container redux. add container version field
|
693d82fa0d9804cbcac1ed790bc9e09e425274bc | --- __tests__/navigation/ToastModalTest.tsx
@@ -40,7 +40,7 @@ const mockGetCurrentRoute = getCurrentRoute as jest.Mock;
describe('isWithinTabs', () => {
it('returns true when within tabs', () => {
- mockGetCurrentRoute.mockReturnValue('home');
+ mockGetCurrentRoute.mockReturnValue('home.root');
expect(isWithinTabs()).toEqual(true);
});
@@ -54,7 +54,7 @@ describe('getToastPosition', () => {
const bottom = 40;
it('returns expected height when within tabs', () => {
- mockGetCurrentRoute.mockReturnValue('home');
+ mockGetCurrentRoute.mockReturnValue('home.root');
expect(getToastPosition(bottom)).toEqual(105);
});
--- src/navigation/NavigationConstants.tsx
@@ -10,10 +10,10 @@ import {CloseIcon} from '@walmart/gtp-shared-components';
export const baseHeaderHeight = 56;
export const TABS_HEIGHT = 45;
export const TAB_SCREEN_NAMES = [
- 'home',
- 'me',
+ 'home.root',
+ 'me.root',
'askSam',
- 'myTeam',
+ 'myTeam.root',
'taskit',
'inbox',
];
| Tab name fix | Tab name fix
|
8ffb4627164c0d08e21e8ca278bc49e5504ecf1b | --- packages/me-at-walmart-container/__tests__/http/interceptors/work.test.ts
@@ -1,49 +1,31 @@
-import { WorkInterceptor } from '../../../src/http/interceptors/work';
-import { AllsparkReduxStore } from '@walmart/allspark-foundation';
-import { WorkActions } from '@walmart/allspark-foundation/Work';
+import {AllsparkReduxStore} from '@walmart/allspark-foundation/Redux';
+import {WorkActions} from '@walmart/allspark-foundation/Work';
+import {WorkInterceptor} from '../../../src/http/interceptors/work';
-/*
-const {WorkInterceptor} = require('../../../src/http/interceptors/work');
-const { AllsparkReduxStore } = require('@walmart/allspark-foundation');
-const { WorkActions } = require('@walmart/allspark-foundation/Work');
-*/
describe('WorkInterceptor', () => {
- const request = {
+ const request = {
+ headers: {
+ 'x-http-client-feature-key': 'topstock',
+ },
+ };
+ const workFlow = 'topstock';
+ it('does NOT add work-action-id header if app is a work app but actionID is NOT present', () => {
+ const {headers} = WorkInterceptor?.request?.fulfilled?.(request);
+ expect(headers['work-action-id']).not.toBeDefined();
+ });
+ it('does NOT add work-action-id header if app is NOT a work app', () => {
+ const {headers} = WorkInterceptor?.request?.fulfilled?.({
headers: {
- 'x-http-client-feature-key': 'topstock'
+ 'x-http-client-feature-key': 'sidekick',
},
- };
-
- it('adds work-action-id header when app is a work app and actionID is present', () => {
- AllsparkReduxStore.dispatch(WorkActions.WORK_FLOW_START({ workFlow: 'topstock', actionId: 'foo' }));
- const { headers } = WorkInterceptor?.request?.fulfilled?.(request);
- expect(headers['work-action-id']).toBe('foo');
- })
- /*
- it('does NOT add work-action-id header if app is a work app but actionID is NOT present', () => {
-
-})
-it('does NOT add work-action-id header if app is NOT a work app', () => {
-
-})
-*/
-})
-
-/*
-describe('WorkInterceptor', () => {
- it('sets work action ID as a header, if action is defined', () => {
- jest
- .spyOn(AllsparkReduxStore, 'select')
- .mockImplementationOnce(() => actionId);
- WorkInterceptor?.request?.fulfilled?.(request);
- expect(mockSet).toHaveBeenCalledWith('work-action-id', actionId);
+ });
+ expect(headers['work-action-id']).not.toBeDefined();
});
- it('does not set work action ID as a header when action ID is undefined', () => {
- mockSet.mockClear();
- jest.spyOn(AllsparkReduxStore, 'select').mockImplementationOnce(() => null);
- WorkInterceptor?.request?.fulfilled?.(request);
- expect(mockSet).not.toHaveBeenCalled();
+ it('adds work-action-id header when app is a work app and actionID is present', () => {
+ AllsparkReduxStore.dispatch(
+ WorkActions.WORK_FLOW_START({actionId: 'foo', workFlow}),
+ );
+ const {headers} = WorkInterceptor?.request?.fulfilled?.(request);
+ expect(headers['work-action-id']).toBe('foo');
});
});
-
-*/
\ No newline at end of file
--- packages/me-at-walmart-container/src/http/interceptors/work.ts
@@ -1,22 +1,23 @@
-import {
- AllsparkReduxStore,
- Interceptor,
- InternalHttpClientRequestConfig
-} from '@walmart/allspark-foundation';
-import { WorkSelectors } from '@walmart/allspark-foundation/Work';
-import { WORK_APPS } from '../constants';
+import {
+ Interceptor,
+ InternalHttpClientRequestConfig,
+} from '@walmart/allspark-foundation/HTTP';
+import {AllsparkReduxStore} from '@walmart/allspark-foundation/Redux';
+import {WorkSelectors} from '@walmart/allspark-foundation/Work';
+import {WORK_APPS} from '../constants';
-export const WorkInterceptor: {options: {[key: string]: any }} & Interceptor = {
+export const WorkInterceptor: {options: {[key: string]: any}} & Interceptor = {
request: {
fulfilled: (request) => {
const actionId = AllsparkReduxStore.select(WorkSelectors.getActionId);
if (actionId) {
- request.headers.set('work-action-id', actionId);
+ request.headers['work-action-id'] = actionId;
}
return request;
},
},
options: {
- runWhen: (config: InternalHttpClientRequestConfig) => WORK_APPS.includes(config.headers['x-http-client-feature-key'])
- }
-}
\ No newline at end of file
+ runWhen: (config: InternalHttpClientRequestConfig) =>
+ WORK_APPS.includes(config.headers['x-http-client-feature-key']),
+ },
+};
| fix: finish tests DWORK-7538 | fix: finish tests DWORK-7538
|
971ab7ba5c2e068c9e01fe4fb979b6bcfc475108 | --- package.json
@@ -149,7 +149,7 @@
"@walmart/roster-mini-app": "3.3.0",
"@walmart/schedule-mini-app": "2.2.1",
"@walmart/shelfavailability-mini-app": "1.5.45",
- "@walmart/shop-gnfr-mini-app": "1.0.302",
+ "@walmart/shop-gnfr-mini-app": "1.0.417",
"@walmart/sidekick-mini-app": "4.201.13",
"@walmart/store-feature-orders": "1.33.3",
"@walmart/taskit-mini-app": "5.39.1",
--- yarn.lock
@@ -7661,7 +7661,7 @@ __metadata:
"@walmart/roster-mini-app": "npm:3.3.0"
"@walmart/schedule-mini-app": "npm:2.2.1"
"@walmart/shelfavailability-mini-app": "npm:1.5.45"
- "@walmart/shop-gnfr-mini-app": "npm:1.0.302"
+ "@walmart/shop-gnfr-mini-app": "npm:1.0.417"
"@walmart/sidekick-mini-app": "npm:4.201.13"
"@walmart/store-feature-orders": "npm:1.33.3"
"@walmart/taskit-mini-app": "npm:5.39.1"
@@ -8423,19 +8423,28 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/shop-gnfr-mini-app@npm:1.0.302":
- version: 1.0.302
- resolution: "@walmart/shop-gnfr-mini-app@npm:1.0.302::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fshop-gnfr-mini-app%2F-%2F%40walmart%2Fshop-gnfr-mini-app-1.0.302.tgz"
+"@walmart/shop-gnfr-mini-app@npm:1.0.417":
+ version: 1.0.417
+ resolution: "@walmart/shop-gnfr-mini-app@npm:1.0.417::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fshop-gnfr-mini-app%2F-%2F%40walmart%2Fshop-gnfr-mini-app-1.0.417.tgz"
peerDependencies:
- "@walmart/allspark-foundation": ">=6.0.0"
- expo: 50.0.17
- expo-image: 1.5.2
+ "@react-native-async-storage/async-storage": ">=1.21.0"
+ "@react-navigation/native": ">=6.0.8"
+ "@react-navigation/stack": ">=6.2.0"
+ "@walmart/allspark-foundation": "*"
+ "@walmart/allspark-http-client": ">=6.3.21"
+ "@walmart/gtp-shared-components": ">=2.2.2"
+ "@walmart/me-at-walmart-common": ">=6.5.0-alpha.0"
react: "*"
react-native: "*"
+ react-native-drop-shadow: ">=1.0.0"
+ react-native-gesture-handler: ">=2.16.0"
+ react-native-get-random-values: ">=1.10.0"
+ react-native-new-snap-carousel: ">=3.9.3"
+ redux: "*"
dependenciesMeta:
"@walmart/me-at-walmart":
built: false
- checksum: 10c0/8319995b478454e93ba28cb005e7c2e8c9d26cf62790a8d02e19711380582d639cfc7115041f422454fb7c233715534806eaebcf0c51a867e2b2501fb4411d0a
+ checksum: 10c0/2d2e635e628b802a1e40be67df2c27c438b51f430ea034711dd2c77cd951be308f2c615c7a2d23c1de66ce349a0eb4164e6540e3bd5c126e3aae4e39b9c0e7e3
languageName: node
linkType: hard
| feat: GNFRTECH-6723 shop-gnfr drop 32 features (#4318) | feat: GNFRTECH-6723 shop-gnfr drop 32 features (#4318)
* feat: GNFRTECH-6808 shop gnfr drop 32 features
* feat: GNFRTECH-6808 ShopGNFR drop 32 changes
* feat: GNFRTECH-6808 shopGNFR drop 32 changes
* feat: GNFRTECH-6808 shopgnfr drop 32 changes
* feat: GNFRTECH-6808 shop GNFR drop 32 changes
* feat: GNFRTECH-6808 shopGNFR drop 32
* feat: GNFRTECH-6808 shop GNFR drop 32 @1.0.408
* feat: GNFRTECH-6808 shopGNFR 1.0.409
* feat: GNFRTECH-6808 shopGNFR 1.0.410
* feat: GNFRTECH-6808 shopGNFR 1.0.412
* feat: GNFRTECH-6808 shopGNFR drop 32 @1.0.413
* feat: GNFRTECH-6808 shopGNFR drop 32 changes
* feat: GNFRTECH-6808 shop GNFR drop 32
* feat: GNFRTECH-6808 shopGNFR drop 32
* feat: GNFRTECH-6808 shopGNFR drop 32 1.0.417
---------
Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com> |
377ece7f861f7dc1b41442571d75d1d4a4bb052b | --- packages/allspark-foundation-hub/__tests__/HubFeature/supplyChain/ShiftFilterList.test.tsx
@@ -72,4 +72,16 @@ describe('ShiftFilterList', () => {
'shift1'
);
});
+
+ it('Test 3: Renders correctly when there are no shifts', () => {
+ const { getByTestId, queryByTestId } = render(
+ <ShiftFilterList {...mockShiftFilterListProps} filterListData={[]} />
+ );
+ expect(getByTestId('hub-header-title')).toBeTruthy();
+ expect(getByTestId('hub-header-subText')).toBeTruthy();
+
+ expect(queryByTestId('shift-filter-shift1')).toBeNull();
+ expect(queryByTestId('shift-filter-shift2')).toBeNull();
+ expect(queryByTestId('shift-filter-shift3')).toBeNull();
+ });
});
| Adding Test 3 for shiftFilterList | Adding Test 3 for shiftFilterList
|
b8aaba113500e55f828d9faf3961450dc9a35404 | --- package-lock.json
@@ -5552,9 +5552,9 @@
"integrity": "sha512-3SoyGLVpJ2hRSUlEmQ1Ro29AUcdagZb8WzqMJDpMgM6PqZU0+btV36GuRb/VCOccii16ONBXrQKCfWqsZmHLYw=="
},
"@walmart/time-clock-mini-app": {
- "version": "0.13.1",
- "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.13.1.tgz",
- "integrity": "sha512-qQ4mDOAFdzEEHqVLOZGBs1RkAy+ZFVnlO1DlBTEcdSzMxGGI/z8OhiCI1cjwSdPx+WAp7DKu1GP29ED0S8mH4A==",
+ "version": "0.13.2",
+ "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.13.2.tgz",
+ "integrity": "sha512-qjYqfH1lpcy5jqk27SCjM+/Hhl5HAYL4XRviHCePSn/Lg7qRbG5jKYZW31BfFtmO+ksH8x/YjMAM+Xs10DKIyA==",
"requires": {
"@react-native-community/datetimepicker": "3.0.9",
"@react-native-picker/picker": "^1.16.1",
@@ -7450,7 +7450,7 @@
"console-control-strings": {
"version": "1.1.0",
"resolved": "https://npme.walmart.com/console-control-strings/-/console-control-strings-1.1.0.tgz",
- "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+ "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
},
"convert-source-map": {
"version": "1.7.0",
@@ -7869,7 +7869,7 @@
"delegates": {
"version": "1.0.0",
"resolved": "https://npme.walmart.com/delegates/-/delegates-1.0.0.tgz",
- "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+ "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
},
"denodeify": {
"version": "1.2.1",
@@ -8607,7 +8607,7 @@
"escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://npme.walmart.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
"dev": true
}
}
@@ -9532,7 +9532,7 @@
"gauge": {
"version": "2.7.4",
"resolved": "https://npme.walmart.com/gauge/-/gauge-2.7.4.tgz",
- "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+ "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==",
"requires": {
"aproba": "^1.0.3",
"console-control-strings": "^1.0.0",
@@ -9547,12 +9547,12 @@
"ansi-regex": {
"version": "2.1.1",
"resolved": "https://npme.walmart.com/ansi-regex/-/ansi-regex-2.1.1.tgz",
- "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+ "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="
},
"is-fullwidth-code-point": {
"version": "1.0.0",
"resolved": "https://npme.walmart.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
- "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+ "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -9560,7 +9560,7 @@
"string-width": {
"version": "1.0.2",
"resolved": "https://npme.walmart.com/string-width/-/string-width-1.0.2.tgz",
- "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+ "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -9570,7 +9570,7 @@
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://npme.walmart.com/strip-ansi/-/strip-ansi-3.0.1.tgz",
- "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+ "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -10113,7 +10113,7 @@
"has-unicode": {
"version": "2.0.1",
"resolved": "https://npme.walmart.com/has-unicode/-/has-unicode-2.0.1.tgz",
- "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+ "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
},
"has-value": {
"version": "1.0.0",
@@ -17381,7 +17381,7 @@
"ms": {
"version": "2.0.0",
"resolved": "https://npme.walmart.com/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
},
"mute-stream": {
"version": "0.0.8",
@@ -20465,7 +20465,7 @@
"sax": {
"version": "0.5.8",
"resolved": "https://npme.walmart.com/sax/-/sax-0.5.8.tgz",
- "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE="
+ "integrity": "sha512-c0YL9VcSfcdH3F1Qij9qpYJFpKFKMXNOkLWFssBL3RuF7ZS8oZhllR2rWlCRjDTJsfq3R6wbSsaRU6o0rkEdNw=="
},
"saxes": {
"version": "5.0.1",
@@ -22697,7 +22697,7 @@
"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",
@@ -22826,7 +22826,7 @@
"xml2js": {
"version": "0.2.8",
"resolved": "https://npme.walmart.com/xml2js/-/xml2js-0.2.8.tgz",
- "integrity": "sha1-m4FpCTFjH/CdGVdUn69U9PmAs8I=",
+ "integrity": "sha512-ZHZBIAO55GHCn2jBYByVPHvHS+o3j8/a/qmpEe6kxO3cTnTCWC3Htq9RYJ5G4XMwMMClD2QkXA9SNdPadLyn3Q==",
"requires": {
"sax": "0.5.x"
}
@@ -22834,7 +22834,7 @@
"xmlbuilder": {
"version": "9.0.7",
"resolved": "https://npme.walmart.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
- "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
+ "integrity": "sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ=="
},
"xmlchars": {
"version": "2.2.0",
@@ -22881,7 +22881,7 @@
"yallist": {
"version": "2.1.2",
"resolved": "https://npme.walmart.com/yallist/-/yallist-2.1.2.tgz",
- "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+ "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
},
"yaml": {
"version": "1.10.0",
--- package.json
@@ -118,7 +118,7 @@
"@walmart/settings-mini-app": "1.8.0",
"@walmart/shelfavailability-mini-app": "1.2.3",
"@walmart/taskit-mini-app": "0.34.0",
- "@walmart/time-clock-mini-app": "0.13.1",
+ "@walmart/time-clock-mini-app": "0.13.2",
"@walmart/ui-components": "1.4.0",
"@walmart/welcomeme-mini-app": "0.70.0",
"@walmart/wfm-ui": "0.2.23",
| Update time clock mini app version | Update time clock mini app version |
c18b81e085aecb8291b98a6558b84960d31a827e | --- ios/Podfile.lock
@@ -623,9 +623,9 @@ PODS:
- JWT (~> 3.0.0-beta.12)
- React-Core
- SSZipArchive (~> 2.2.2)
- - compass-sdk-ios (0.3.17)
- - compass-sdk-rn (5.18.9):
- - compass-sdk-ios (= 0.3.17)
+ - compass-sdk-ios (0.4.2)
+ - compass-sdk-rn (5.18.14):
+ - compass-sdk-ios (= 0.4.2)
- React-Core
- DoubleConversion (1.1.6)
- EXAV (13.4.1):
@@ -1591,7 +1591,7 @@ PODS:
- TOCropViewController (2.6.1)
- topstock-mini-app (1.4.8):
- React
- - VisionCamera (3.6.13):
+ - VisionCamera (3.7.1):
- React
- React-callinvoker
- React-Core
@@ -2051,8 +2051,8 @@ SPEC CHECKSUMS:
BVLinearGradient: 34a999fda29036898a09c6a6b728b0b4189e1a44
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
CodePush: dce1b253fde81078249ea9cd4b948e4ac7b761a9
- compass-sdk-ios: 99bfb0213f79afc87f43483930c90c0ba5a1c423
- compass-sdk-rn: ddc6f2bb3ceb24a54fef4837dc9a9407c3c174fb
+ compass-sdk-ios: 9e63f7c6520337bb810fb3ba32262ac03f7ef735
+ compass-sdk-rn: 59e599127941975b294ab31cfcf016e619d7b75e
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
EXAV: f393dfc0b28214d62855a31e06eb21d426d6e2da
EXConstants: ce5bbea779da8031ac818c36bea41b10e14d04e1
@@ -2205,9 +2205,9 @@ SPEC CHECKSUMS:
StructuredLogAssistantIOS: d48c327b3b67366d954435891dc1e748a6aeb9c1
SumoSDK: 95c692d2e6644ca3c2cd1a856aa823e163acac45
TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
- topstock-mini-app: 087f72475c79e70547919002f5e8a7cd1e0a149c
- VisionCamera: 68e892a9d36105b59395cd3e9518c7828fa9d3e0
- walmart-react-native-sumo-sdk: f596733b7121809fcc6366e3c858384f530d5868
+ topstock-mini-app: b77d71ab047e36a75bb5cd120f344d86c9f255f4
+ VisionCamera: ef56ac9d3e0fef4b94c7cf75735aaccc2326e35a
+ walmart-react-native-sumo-sdk: 02719d035c1a52e951e15097fae5ea17b459f71c
wifi-store-locator: 501fca0a220c725ed93ab403635c0f246a8ce7e3
Yoga: b76f1acfda8212aa16b7e26bcce3983230c82603
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
| git merge | git merge
|
7c1d176dbe5e5b1eef70abad0efccc19cfd1cc6b | --- packages/allspark-foundation/package.json
@@ -139,6 +139,7 @@
"react": "18.x",
"react-native": "0.72.x",
"react-native-apollo-devtools-client": "*",
+ "react-native-device-info": "*",
"react-native-flipper": "*",
"react-native-gesture-handler": "2.x",
"react-native-get-random-values": "1.x",
| chore: add missing peer dependency of device info required by gtp | chore: add missing peer dependency of device info required by gtp
|
6f536ef759a7cb9a45ca17ec64cadf5af13e3cb5 | --- targets/US/package.json
@@ -140,7 +140,7 @@
"@walmart/redux-store": "~6.3.28",
"@walmart/returns-mini-app": "4.15.0",
"@walmart/rfid-scan-mini-app": "2.4.4",
- "@walmart/rn-receiving-mini-app": "2.3.332",
+ "@walmart/rn-receiving-mini-app": "2.3.340",
"@walmart/roster-mini-app": "2.9.0",
"@walmart/schedule-mini-app": "0.118.2",
"@walmart/shelfavailability-mini-app": "1.5.37",
--- yarn.lock
@@ -7056,7 +7056,7 @@ __metadata:
"@walmart/redux-store": "npm:~6.3.28"
"@walmart/returns-mini-app": "npm:4.15.0"
"@walmart/rfid-scan-mini-app": "npm:2.4.4"
- "@walmart/rn-receiving-mini-app": "npm:2.3.332"
+ "@walmart/rn-receiving-mini-app": "npm:2.3.340"
"@walmart/roster-mini-app": "npm:2.9.0"
"@walmart/schedule-mini-app": "npm:0.118.2"
"@walmart/shelfavailability-mini-app": "npm:1.5.37"
@@ -7769,9 +7769,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/rn-receiving-mini-app@npm:2.3.332":
- version: 2.3.332
- resolution: "@walmart/rn-receiving-mini-app@npm:2.3.332"
+"@walmart/rn-receiving-mini-app@npm:2.3.340":
+ version: 2.3.340
+ resolution: "@walmart/rn-receiving-mini-app@npm:2.3.340"
dependencies:
"@walmart/atlas-rn-ui-components": "npm:1.1.11"
"@walmart/loadquality-mini-app": "npm:1.0.139"
@@ -7797,7 +7797,7 @@ __metadata:
react-native-svg: ">=14.1.0"
react-native-svg-transformer: ">=1.1.0"
react-native-vision-camera: ^2.16.8
- checksum: 10c0/8a93b74acc1f58441ca1983d0419782feb36fc6bca74bc3c36b88db2cf75e5b9550a1792b35663e3c11c353d5727470a95e13dec5c3749f591188abe6cb26c00
+ checksum: 10c0/84b33d021324c4cf14cab3a31198c85b6765f5a8d4fb579796daf6284c56040945679a25dadf6ac7c76ee9e5e412bc74b2f3a22be9a284f42d51fe8e3d719636
languageName: node
linkType: hard
| 2.3.340 - Receiving version update - drop26 | 2.3.340 - Receiving version update - drop26
|
5cdeefa0053cc188707af5b24f7269861f377fa9 | --- packages/allspark-foundation/src/Container/AllsparkContainer.tsx
@@ -124,7 +124,7 @@ export class AllsparkContainer<
* @param config - The configuration object for the container.
*/
constructor(id: string, config: AllsparkContainerConfig<E, T>) {
- if (!id && id.length < 1) {
+ if (!id || id.length < 1) {
throw new Error('AllsparkContainer Intilization Error: id is required');
}
if (!config.environment) {
| fix(container): update id check | fix(container): update id check
Co-authored-by: qodo-merge[bot] <98856+qodo-merge[bot]@users.noreply.gecgithub01.walmart.com> |
01c39df60e5805347478dad389ab6b15aeb78429 | --- targets/US/package.json
@@ -144,7 +144,7 @@
"@walmart/roster-mini-app": "2.8.2",
"@walmart/schedule-mini-app": "0.118.0",
"@walmart/shelfavailability-mini-app": "1.5.33",
- "@walmart/shop-gnfr-mini-app": "1.0.121",
+ "@walmart/shop-gnfr-mini-app": "1.0.124",
"@walmart/sidekick-mini-app": "4.67.15",
"@walmart/store-feature-orders": "1.26.12",
"@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.3.0#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.3.0-a2dd632c59.patch",
--- yarn.lock
@@ -7141,7 +7141,7 @@ __metadata:
"@walmart/roster-mini-app": "npm:2.8.2"
"@walmart/schedule-mini-app": "npm:0.118.0"
"@walmart/shelfavailability-mini-app": "npm:1.5.33"
- "@walmart/shop-gnfr-mini-app": "npm:1.0.121"
+ "@walmart/shop-gnfr-mini-app": "npm:1.0.124"
"@walmart/sidekick-mini-app": "npm:4.67.15"
"@walmart/store-feature-orders": "npm:1.26.12"
"@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.3.0#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.3.0-a2dd632c59.patch"
@@ -8017,9 +8017,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/shop-gnfr-mini-app@npm:1.0.121":
- version: 1.0.121
- resolution: "@walmart/shop-gnfr-mini-app@npm:1.0.121"
+"@walmart/shop-gnfr-mini-app@npm:1.0.124":
+ version: 1.0.124
+ resolution: "@walmart/shop-gnfr-mini-app@npm:1.0.124"
dependencies:
"@testing-library/react-native": "npm:^12.5.1"
react-native-drop-shadow: "npm:^1.0.0"
@@ -8033,7 +8033,7 @@ __metadata:
"@walmart/gtp-shared-components": ^2.0.0
react: ^18.2.0
react-native: ~0.70.5
- checksum: 10c0/70b1a7b7c5893148c2415ead723e8f6cf515008a1408832a966429cac357280ec1bf5aa9541991ce21eabe6f0c39f780d9030a33957d0c4f0c9caba782980930
+ checksum: 10c0/4bb167a835d68db53ac4271419da1c7d1723d90377182c3c0bee29854cfb6e21e74d8d095f4ce4fc17afd43959e38bd2797bc71a2658e9c087c3fd6db1fb870a
languageName: node
linkType: hard
| added 1.0.124 version for shop-gnfr | added 1.0.124 version for shop-gnfr
|
a582bfc0f51a171aa919d9a6d7189872bfd67728 | --- src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen/useSupplyChainQueries.ts
@@ -8,12 +8,12 @@ import {
import {RosterDetailScreenProps} from '../types';
import {logger} from '../../../common';
import moment from 'moment';
-import {useStoreRosterDetails} from '../StoreRosterDetailScreen/useStoreRosterDetails';
+import {useSupplyChainRosterDetails} from './useSupplyChainRosterDetails';
export const useSupplyChainRosterDetailsQueries = ({
route,
}: RosterDetailScreenProps) => {
- const {teamState} = useStoreRosterDetails({route});
+ const {teamState} = useSupplyChainRosterDetails({route});
const [refreshState, setRefreshState] = useState<{
refreshTime: string | null;
| fix(ui): update supply chain query hook fix | fix(ui): update supply chain query hook fix
|
353ee87f3de15319eb60994b1a16cabd1798b59e | --- docs/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [2.3.1](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.3.0...v2.3.1) (2024-06-13)
+
+
+### Bug Fixes
+
+* **looperCoverage:** added var for looper coverage ([d67d1c6](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/d67d1c6a0ddf0ce8d37e734bd6c7f8ff557fbdfa))
+
# [2.3.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.2.0...v2.3.0) (2024-06-11)
--- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/roster-mini-app",
- "version": "2.3.0",
+ "version": "2.3.1",
"main": "dist/index.js",
"files": [
"dist"
| chore(release): 2.3.1 [skip ci] | chore(release): 2.3.1 [skip ci]
## [2.3.1](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.3.0...v2.3.1) (2024-06-13)
### Bug Fixes
* **looperCoverage:** added var for looper coverage ([d67d1c6](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/d67d1c6a0ddf0ce8d37e734bd6c7f8ff557fbdfa))
|
9d39f957c6985d66fde2a7b29d47d590d13f6235 | --- packages/allspark-foundation-hub/__tests__/HubFeature/TeamOnboarding/TeamSelectionList.test.tsx
@@ -1,118 +1,11 @@
import React from 'react';
-import { render as ren } from '../../utils/index';
-import { render, fireEvent, waitFor } from '@testing-library/react-native';
+import { render, fireEvent } from '@testing-library/react-native';
import { TeamSelectionList } from '../../../src/HubFeature/TeamSelection/Component/TeamSelectionList';
import { useDispatch, useSelector } from 'react-redux';
import { useSafeAreaInsets } from 'react-native-safe-area-context';
import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation';
import { useUpsertManagerExperiencePreferenceMutation } from '@walmart/me-at-walmart-athena-queries';
-import { AllsparkNavigationClient } from '@walmart/allspark-foundation/Navigation';
-import { StackActions } from '@react-navigation/native';
-import { LoggerService } from '@walmart/allspark-foundation/Logger';
-import {
- ManagerExperienceCreators,
- ManagerExperienceSelectors,
- teamSelectionHeaderEnabled,
-} from '../../../src/HubFeature/Redux';
-
-describe('TeamSelectionList Component Tests', () => {
- let props;
-
- beforeEach(() => {
- jest.mock('../../../__mocks__/data/teamData', () => ({
- default: {
- 'Digital': ['Team A', 'Team B'],
- 'Admin & Support': ['Team C'],
- 'Marketing': ['Team D', 'Team E'],
- },
- }));
- props = {
- userType: 'admin',
- sections: [
- {
- title: 'Digital',
- data: [
- { teamName: 'Team A', teamId: '111111' },
- { teamName: 'Team B', teamId: '111111' },
- ],
- isPrimaryArea: true,
- },
- {
- title: 'Admin & Support',
- data: [{ teamName: 'Team C', teamId: '111111' }],
- isPrimaryArea: false,
- },
- {
- title: 'Marketing',
- data: [
- { teamName: 'Team D', teamId: '111111' },
- { teamName: 'Team E', teamId: '111111' },
- ],
- isPrimaryArea: false,
- },
- ],
- selectedTeams: ['Team A'],
- allAvailableTeams: ['Team A', 'Team B', 'Team C', 'Team D', 'Team E'],
- primaryTeamName: 'Team A',
- selectedTeamIds: ['12345678'],
- handleSelectSingle: jest.fn(),
- handleSelectAll: jest.fn(),
- };
- jest.clearAllMocks();
- });
-
- test('renders with no selected teams', () => {
- const { getByTestId } = ren(<TeamSelectionList {...props} />);
- expect(getByTestId('selectionList')).toBeDefined();
- });
-
- test('renders with selected teams', () => {
- const { getAllByTestId, getByTestId } = ren(
- <TeamSelectionList {...props} selectedTeams={['Digital']} />
- );
- const digitalElements = getAllByTestId('teamSelection-areaHeader');
- expect(digitalElements.length).toBeGreaterThan(0);
- expect(getByTestId('selectionBanner-label')).toBeDefined();
- });
-
- test('renders correctly for non-admin users', () => {
- const { queryByText } = ren(
- <TeamSelectionList {...props} userType='user' />
- );
- expect(queryByText('Select All')).toBeNull();
- });
-
- test('renders primary area section correctly', () => {
- const { getByTestId } = ren(
- <TeamSelectionList {...props} areas={['Digital']} />
- );
- expect(getByTestId('teamSelection-myArea')).toBeDefined();
- });
-
- test('does not render primary area section for non-primary areas', () => {
- const { queryByText } = ren(
- <TeamSelectionList {...props} areas={['Admin & Support']} />
- );
- expect(queryByText('My area')).toBeNull();
- });
-
- test('renders empty list for empty areas array', () => {
- const { queryByTestId } = ren(
- <TeamSelectionList {...props} sections={[]} />
- );
- expect(queryByTestId('team-list-item')).toBeNull();
- });
-
- test('renders footer as sticky', () => {
- const { getByTestId } = ren(<TeamSelectionList {...props} />);
- const footer = getByTestId('team-selection-footer');
- expect(footer).toBeTruthy();
- const footerStyles = footer.props.style;
- expect(footerStyles.position).toBe('absolute');
- expect(footerStyles.bottom).toBe(0);
- expect(footerStyles.width).toBe('100%');
- });
-});
+import { teamSelectionHeaderEnabled } from '../../../src/HubFeature/Redux';
jest.mock('react-redux', () => ({
useDispatch: jest.fn(),
@@ -171,16 +64,15 @@ describe('TeamSelectionList Component Tests', () => {
useDispatch.mockReturnValue(dispatchMock);
useSafeAreaInsets.mockReturnValue({ bottom: 0 });
useAllsparkTranslation.mockReturnValue({ t: jest.fn((key) => key) });
- // useSelector.mockImplementation((selector) => selector());
upsertManagerExperiencePreferenceMutationMock = jest
.fn()
.mockReturnValue([jest.fn(), { loading: false }]);
- // useUpsertManagerExperiencePreferenceMutation.mockReturnValue(
- // upsertManagerExperiencePreferenceMutationMock
- // );
+ useUpsertManagerExperiencePreferenceMutation.mockReturnValue(
+ upsertManagerExperiencePreferenceMutationMock
+ );
useUpsertManagerExperiencePreferenceMutation.mockReturnValue([
- jest.fn(), // Mock mutation function
- { loading: false }, // Mock loading state
+ jest.fn(),
+ { loading: false },
]);
props = {
@@ -216,7 +108,6 @@ describe('TeamSelectionList Component Tests', () => {
handleSelectAll: jest.fn(),
};
jest.clearAllMocks();
- // afterAll(cleanup);
});
test('renders with no selected teams', () => {
@@ -297,42 +188,15 @@ describe('TeamSelectionList Component Tests', () => {
test('handles upsertManagerExperiencePreferenceMutation success', async () => {
const mockOnComplete = jest.fn();
- (
- useUpsertManagerExperiencePreferenceMutation as jest.Mock
- ).mockImplementationOnce(() => ({
- onComplete: mockOnComplete,
- }));
- const { getByTestId } = ren(<TeamSelectionList {...props} />);
- const saveButton = getByTestId('saveTeam-button');
- const s = saveButton.props;
- const s2 = saveButton.props;
- console.log(saveButton.props);
- fireEvent.press(saveButton);
- mockOnComplete();
- await waitFor(() => {
- expect(mockOnComplete).toHaveBeenCalledWith(
- ManagerExperienceCreators.completeTeamSelection(expect.any(String))
- );
- });
- });
-
- test.skip('handles upsertManagerExperiencePreferenceMutation error', async () => {
- const upsertManagerExperiencePreferenceMutation = jest
- .fn()
- .mockImplementation(({ onError }) => {
- onError(new Error('Test error'));
- });
useUpsertManagerExperiencePreferenceMutation.mockReturnValue([
- upsertManagerExperiencePreferenceMutation,
- { loading: false },
+ jest.fn(),
+ { loading: false, onCompleted: mockOnComplete },
]);
+
const { getByTestId } = render(<TeamSelectionList {...props} />);
- const saveButton = getByTestId('save-button');
+ const saveButton = getByTestId('saveTeam-button');
fireEvent.press(saveButton);
- await waitFor(() => {
- expect(dispatchMock).toHaveBeenCalledWith(
- ManagerExperienceCreators.userTeamSelectionFailed('Test error')
- );
- });
+ mockOnComplete();
+ expect(mockOnComplete).toHaveBeenCalledTimes(1);
});
});
| Adding team selection test coverage | Adding team selection test coverage
|
6f69203e770b2d00ece033510416b19a6d99afcd | --- __tests__/home/components/TaskCard/TaskClockStatusStoreCardTest.tsx
@@ -83,7 +83,10 @@ describe('TaskClockStatusStoreCard', () => {
expect(logWMTelemetryTouchComponentEvent).toHaveBeenCalledWith(
'task_view_roster',
);
- expect(mockNavigation.navigate).toHaveBeenCalledWith("myTeam", {"params": {"params": {"screen": "roster"}, "screen": "myTeam.tabs"}, "screen": "myTeam.root"});
+ expect(mockNavigation.navigate).toHaveBeenCalledWith('myTeam', {
+ params: {params: {screen: 'roster'}, screen: 'myTeam.tabs'},
+ screen: 'myTeam.root',
+ });
});
it('matches snapshot when loaded with team view for DC', () => {
--- __tests__/home/components/TaskCard/TaskClockStatusTeamCard2Test.tsx
@@ -98,7 +98,10 @@ describe('TaskClockStatusTeamCard2', () => {
expect(logWMTelemetryTouchComponentEvent).toHaveBeenCalledWith(
'task_view_roster',
);
- expect(mockNavigation.navigate).toHaveBeenCalledWith("myTeam", {"params": {"params": {"screen": "roster"}, "screen": "myTeam.tabs"}, "screen": "myTeam.root"});
+ expect(mockNavigation.navigate).toHaveBeenCalledWith('myTeam', {
+ params: {params: {screen: 'roster'}, screen: 'myTeam.tabs'},
+ screen: 'myTeam.root',
+ });
});
it('handles loading while data is present', () => {
| Update test | Update test
|
7ae426b12171fedb56b38e232384535f1cecf655 | --- 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.24",
+ "@walmart/facilities-management-miniapp": "0.5.25-rc1",
"@walmart/feedback-all-spark-miniapp": "0.9.10",
"@walmart/financial-wellbeing-feature-app": "1.1.2",
"@walmart/functional-components": "2.0.6",
| Test FCM https://jira.walmart.com/browse/REC-5468 | Test FCM https://jira.walmart.com/browse/REC-5468
Test FCM https://jira.walmart.com/browse/REC-5468 |
089a33c38b9dd66548369a8936fca4f34b689c10 | --- src/auth/ErrorScreen.tsx
@@ -14,7 +14,6 @@ import WmTelemetry from 'react-native-wm-telemetry';
import {
LinkButton,
PrimaryButton,
- Dropdown,
RadioItemGroup,
CheckboxItemGroup,
Subheader,
@@ -27,6 +26,7 @@ import {logger} from '../services/Logger';
import {encryptUserId} from '../services/MaskUserId';
import styles from './styles';
import {ERROR_CATEGORIES, Q1Options, Q2Options} from './constants';
+import {Picker} from '@react-native-community/picker';
export const ErrorScreen: FC<any> = (props) => {
const {navigation} = props;
@@ -73,11 +73,7 @@ export const ErrorScreen: FC<any> = (props) => {
}
};
- const getIssueList = () =>
- ERROR_CATEGORIES.map((err) => translate(`ssoError.issues.${err}`));
-
const getOptions = (list: Array<string>) => {
- // const list = qNum === 1 ? Q1Options : Q2Options;
return list.map((opn, index) => ({
id: index,
label: translate(`ssoError.otherIssue.${opn}`),
@@ -154,15 +150,16 @@ export const ErrorScreen: FC<any> = (props) => {
styles.userIdInput,
!siteIdValid && styles.errorBorder,
]}>
- <Dropdown
- style={styles.input}
- value={errorCategory}
- values={getIssueList()} // todo
- // label={translate('ssoError.selectIssue')}
- onSelect={(itemValue: string) => {
- seterrorCategory(itemValue);
- }}
- />
+ <Picker
+ selectedValue={errorCategory}
+ onValueChange={(itemValue) => seterrorCategory(itemValue)}>
+ {ERROR_CATEGORIES.map((err) => {
+ const errTranslate = translate(`ssoError.issues.${err}`);
+ return (
+ <Picker.Item label={errTranslate} value={errTranslate} />
+ );
+ })}
+ </Picker>
</View>
{missingFields && (
<View style={styles.requiredErrorContainer}>
@@ -191,7 +188,7 @@ export const ErrorScreen: FC<any> = (props) => {
{translate('ssoError.otherIssue.q2')}
</Text>
<RadioItemGroup
- items={getOptions(Q1Options)}
+ items={getOptions(Q2Options)}
selectedId={selectedQ2Option}
onSelect={(id) => setSelectedQ2Option(id)}
/>
--- src/auth/constants.ts
@@ -16,4 +16,4 @@ export const ERROR_CATEGORIES = [
];
export const Q1Options = ['q1Option1', 'q1Option2', 'q1Option3'];
-export const Q2Options = ['q1Option1', 'q1Option2', 'q1Option3'];
+export const Q2Options = ['q2Option1', 'q2Option2', 'q2Option3'];
| replace picker component | replace picker component
|
047330d30e31f5610ddced8363b2200b349b6282 | --- package-lock.json
@@ -4400,7 +4400,7 @@
"@walmart/react-native-shared-navigation": {
"version": "0.4.0",
"resolved": "https://npme.walmart.com/@walmart/react-native-shared-navigation/-/react-native-shared-navigation-0.4.0.tgz",
- "integrity": "sha1-dBX44FzZJKjZPuXiMoFiFQzybYE="
+ "integrity": "sha512-xXCe5sJeytOO9HAKLaTiQQMzomfUS2wUP6ICLYv9BGtdJUDmoKNT7aFYeRDGPgvPvkc1A8oFrqJIrOshjLnxSg=="
},
"@walmart/react-native-sumo-sdk": {
"version": "2.2.1",
@@ -4520,9 +4520,9 @@
"integrity": "sha512-0iyAhb//FPU+b3M6gP/NYGPCFXLdLJVEFW7LKLqHHPnY+2M3E1DfNEq3hGdRchFxEjxURFdLaorHnfpbvDFGKw=="
},
"@walmart/time-clock-mini-app": {
- "version": "0.5.1",
- "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.5.1.tgz",
- "integrity": "sha512-PObnXnDzRjMvHk3HstZyMHitmQxh6QsUIgHsj7TR/eXPvbV0j9BV+xLbNCL7S7CYpmjEwe+TVze7RKUe4OoX8A==",
+ "version": "0.5.2",
+ "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.5.2.tgz",
+ "integrity": "sha512-tw6aB5kYfnNyKgjI/HhCR8xFTSgL7P/LZGg2mQgPZ2xiZWgF9ChgBkcUC4VWW61anNWDQK8tjJGQzOEVy80tVg==",
"requires": {
"@react-native-community/datetimepicker": "3.0.9",
"@react-native-picker/picker": "^1.16.1",
@@ -15950,7 +15950,7 @@
"nano-time": {
"version": "1.0.0",
"resolved": "https://npme.walmart.com/nano-time/-/nano-time-1.0.0.tgz",
- "integrity": "sha1-sFVPaa2J4i0JB/ehKwmTpdlhN+8=",
+ "integrity": "sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==",
"requires": {
"big-integer": "^1.6.16"
}
@@ -18269,9 +18269,9 @@
"integrity": "sha512-5XwA0/NyFTqF2QqPeSs89LrK2337a2pfoLX44HlRCXLeHOVbZjC+CFkCuMW6k1u+RnSbDv3ROR44jdV6Dul+9A=="
},
"react-query": {
- "version": "3.39.0",
- "resolved": "https://npme.walmart.com/react-query/-/react-query-3.39.0.tgz",
- "integrity": "sha512-Od0IkSuS79WJOhzWBx/ys0x13+7wFqgnn64vBqqAAnZ9whocVhl/y1padD5uuZ6EIkXbFbInax0qvY7zGM0thA==",
+ "version": "3.39.1",
+ "resolved": "https://npme.walmart.com/react-query/-/react-query-3.39.1.tgz",
+ "integrity": "sha512-qYKT1bavdDiQZbngWZyPotlBVzcBjDYEJg5RQLBa++5Ix5jjfbEYJmHSZRZD+USVHUSvl/ey9Hu+QfF1QAK80A==",
"requires": {
"@babel/runtime": "^7.5.5",
"broadcast-channel": "^3.4.1",
@@ -18666,7 +18666,7 @@
"remove-accents": {
"version": "0.4.2",
"resolved": "https://npme.walmart.com/remove-accents/-/remove-accents-0.4.2.tgz",
- "integrity": "sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U="
+ "integrity": "sha512-7pXIJqJOq5tFgG1A2Zxti3Ht8jJF337m4sowbuHsW30ZnkQFnDzy9qBNhgzX8ZLW4+UBcXiiR7SwR6pokHsxiA=="
},
"remove-trailing-separator": {
"version": "1.1.0",
--- package.json
@@ -102,7 +102,7 @@
"@walmart/settings-mini-app": "1.6.0",
"@walmart/shelfavailability-mini-app": "0.8.3",
"@walmart/taskit-mini-app": "0.19.0",
- "@walmart/time-clock-mini-app": "0.5.1",
+ "@walmart/time-clock-mini-app": "0.5.2",
"@walmart/ui-components": "1.4.0-rc.0",
"@walmart/welcomeme-mini-app": "0.60.0",
"@walmart/wfm-ui": "0.2.14",
| Bump time clock mini app to 0.5.2 for drop 7 | Bump time clock mini app to 0.5.2 for drop 7
|
7a852573aaa56eaef71b36d4d68d1a0ad91138ee | --- packages/me-at-walmart-container/__tests__/services/config.test.ts
@@ -30,6 +30,7 @@ describe('actualListener', () => {
afterEach(() => {
jest.clearAllMocks();
});
+
it('should not call ChangeEventManager.runEvent when result is undefined', () => {
const runEventSpy = jest.spyOn(ChangeEventManager, 'runEvent');
actualListener(undefined);
@@ -75,7 +76,7 @@ describe('fetch', () => {
afterEach(() => {
jest.clearAllMocks();
});
-
+
it('should call fetchAppConfig with correct arguments and manage listeners', async () => {
const mockConfig = { key: 'value', forceRefresh: true }; // Replace with actual AppConfigFetchParams
const mockData = { some: 'data' }; // Mocked return data
@@ -84,18 +85,15 @@ describe('fetch', () => {
// Assertions for fetchAppConfig
expect(AppConfig.fetchAppConfig).toHaveBeenCalledTimes(1);
expect(AppConfig.fetchAppConfig).toHaveBeenCalledWith(mockConfig, true);
-
// Assertions for listener removal and addition
expect(AppConfig.removeAppConfigListener).toHaveBeenCalledTimes(1);
expect(AppConfig.removeAppConfigListener).toHaveBeenCalledWith(LISTENER_KEY);
-
expect(AppConfig.addAppConfigListener).toHaveBeenCalledTimes(1);
expect(AppConfig.addAppConfigListener).toHaveBeenCalledWith(
LISTENER_KEY,
{ key: 'value' }, // `scope` after removing `forceRefresh`
actualListener
);
-
// Result assertion
expect(result).toEqual(mockData);
});
@@ -104,13 +102,10 @@ describe('fetch', () => {
const mockConfig = { key: 'value', forceRefresh: false };
const mockError = new Error('Fetch failed');
(AppConfig.fetchAppConfig as jest.Mock).mockRejectedValueOnce(mockError);
-
await expect(fetch(mockConfig)).rejects.toThrow('Fetch failed');
-
// Assertions for fetchAppConfig
expect(AppConfig.fetchAppConfig).toHaveBeenCalledTimes(1);
expect(AppConfig.fetchAppConfig).toHaveBeenCalledWith(mockConfig, false);
-
// Assertions for listener removal and addition (should not be called due to rejection)
expect(AppConfig.removeAppConfigListener).not.toHaveBeenCalled();
expect(AppConfig.addAppConfigListener).not.toHaveBeenCalled();
| removed whitespaces | removed whitespaces
|
bbb9df03652358dd98ea556422942bb4b2c32890 | --- packages/me-at-walmart-container/__tests__/utils/setup.js
@@ -1,6 +1,4 @@
-
jest.mock('react-native/Libraries/EventEmitter/NativeEventEmitter');
-import 'react-native-gesture-handler/jestSetup';
const {NativeModules} = require('react-native');
// Stub out NativeModules
| fix: revert setup.js change DWORK-753 | fix: revert setup.js change DWORK-753
8
|
6493e9cb2a7094f1db2031c02f631512b01d59ad | --- package.json
@@ -8,7 +8,7 @@
"description": "",
"private": true,
"scripts": {
- "build": "tsc -b --verbose --force packages",
+ "build": "yarn run clean && tsc -b --verbose --force packages",
"clean:tsbuildinfo": "rm -rf packages/*.tsbuildinfo || true",
"clean": "yarn run clean:tsbuildinfo && yarn workspaces foreach --all --topological-dev run clean",
"commit": "commit",
| Update yarn build | Update yarn build
|
9fb2a5e2334faf18914b9911e7243d4445630666 | --- package.json
@@ -104,7 +104,7 @@
"@walmart/react-native-sumo-sdk": "2.6.0",
"@walmart/redux-store": "6.1.4",
"@walmart/ui-components": "1.15.1",
- "@walmart/wmconnect-mini-app": "2.23.0",
+ "@walmart/wmconnect-mini-app": "2.23.1",
"babel-jest": "^29.2.1",
"chance": "^1.1.11",
"eslint": "8.22.0",
--- yarn.lock
@@ -6460,7 +6460,7 @@ __metadata:
"@walmart/react-native-sumo-sdk": "npm:2.6.0"
"@walmart/redux-store": "npm:6.1.4"
"@walmart/ui-components": "npm:1.15.1"
- "@walmart/wmconnect-mini-app": "npm:2.23.0"
+ "@walmart/wmconnect-mini-app": "npm:2.23.1"
babel-jest: "npm:^29.2.1"
chance: "npm:^1.1.11"
eslint: "npm:8.22.0"
@@ -6595,9 +6595,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/wmconnect-mini-app@npm:2.23.0":
- version: 2.23.0
- resolution: "@walmart/wmconnect-mini-app@npm:2.23.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-2.23.0.tgz"
+"@walmart/wmconnect-mini-app@npm:2.23.1":
+ version: 2.23.1
+ resolution: "@walmart/wmconnect-mini-app@npm:2.23.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-2.23.1.tgz"
peerDependencies:
"@react-native-async-storage/async-storage": ^1.21.0
"@react-native-community/netinfo": ^11.0.1
@@ -6637,7 +6637,7 @@ __metadata:
redux: ^4.2.1
redux-saga: ^1.2.3
wifi-store-locator: 1.4.1
- checksum: 10c0/3fb21cc559b7cfcf47f6a55a3659bb6dc2087c0f6599170bca13892b7013280e6c61d9c981e0eec4f248bac17ac5fbd994f3fa70092d7c0600295b9a00d50dc5
+ checksum: 10c0/a06e03971565433bf73c257e0a515217638dc58229722b918ed44beb0556a9b1fd2937a9e72e5ba4fea60046d9bf4dfd2b49e55f158b86df7dbe682865a52f68
languageName: node
linkType: hard
| fix(ui): update modal for roster screens | fix(ui): update modal for roster screens
|
27572eea264cfde39f2d4ff17222057e78643ad5 | --- targets/US/package.json
@@ -107,7 +107,7 @@
"@walmart/functional-components": "~6.3.28",
"@walmart/gta-react-native-calendars": "0.7.0",
"@walmart/gtp-shared-components": "2.2.4",
- "@walmart/ims-print-services-ui": "2.15.3",
+ "@walmart/ims-print-services-ui": "2.16.0",
"@walmart/inbox-mini-app": "0.96.6",
"@walmart/iteminfo-mini-app": "8.0.1",
"@walmart/learning-mini-app": "20.0.35",
@@ -117,7 +117,7 @@
"@walmart/me-at-walmart-container": "workspace:^",
"@walmart/me-at-walmart-core": "workspace:^",
"@walmart/metrics-mini-app": "1.24.4",
- "@walmart/mod-flex-mini-app": "1.21.6",
+ "@walmart/mod-flex-mini-app": "1.23.1",
"@walmart/moment-walmart": "1.0.4",
"@walmart/money-auth-shared-components": "0.1.22",
"@walmart/myteam-mini-app": "1.12.0",
| bump up modflex and print version for drop 27 testing | bump up modflex and print version for drop 27 testing
|
767113bb6cd2a00bf8b56b96424ce9f1f3babfec | --- package-lock.json
@@ -9359,9 +9359,9 @@
}
},
"react-native-wm-barcode": {
- "version": "2.1.0",
- "resolved": "https://npme.walmart.com/react-native-wm-barcode/-/react-native-wm-barcode-2.1.0.tgz",
- "integrity": "sha512-hSFyGpCsQ1UbHk5lvkcPZQhwiXuJT4E28r9a2JI4PKzGqWmwNJKZA2iGkIin/QruWfORxYTCUDU0rH81HodtpQ=="
+ "version": "2.3.0",
+ "resolved": "https://npme.walmart.com/react-native-wm-barcode/-/react-native-wm-barcode-2.3.0.tgz",
+ "integrity": "sha512-B4sr2D46JndoZ16OFnL9Zs8g/SUeFo4JItAJdf58kCZ08meMwZ3svXzRyfYtR1tWMUHmK5OuXwIu6KP4WQqd1g=="
},
"react-native-wm-config": {
"version": "0.1.1",
--- package.json
@@ -84,11 +84,11 @@
"react-native-video": "^5.1.0-alpha8",
"react-native-view-shot": "^3.1.2",
"react-native-webview": "^10.7.0",
- "react-native-wm-barcode": "2.1.0",
+ "react-native-wm-barcode": "^2.3.0",
+ "react-native-wm-config": "^0.1.1",
"react-native-wm-notification": "^0.1.1",
"react-native-wm-telemetry": "^0.2.0",
"react-native-wm-voice-text": "^0.3.0",
- "react-native-wm-config": "^0.1.1",
"react-redux": "^7.2.1",
"redux": "^4.0.5",
"redux-devtools-extension": "^2.13.8",
| update barcode version (#104) | update barcode version (#104)
|
9bb078cb2ba0b03cd1702c584cdbfe6e8f0af761 | --- docs/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [3.1.1](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/compare/v3.1.0...v3.1.1) (2025-07-01)
+
+
+### Bug Fixes
+
+* **ui:** update readme and looper ([b369b19](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/commit/b369b19f5cb8ef4ca28754e5469b8b1dc8ec9ca3))
+
# [2.43.0](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/compare/v2.42.0...v2.43.0) (2025-06-28)
--- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/wmconnect-mini-app",
- "version": "3.1.0",
+ "version": "3.1.1",
"main": "dist/index.js",
"files": [
"dist",
| chore(release): 3.1.1 [skip ci] | chore(release): 3.1.1 [skip ci]
## [3.1.1](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/compare/v3.1.0...v3.1.1) (2025-07-01)
### Bug Fixes
* **ui:** update readme and looper ([b369b19](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/commit/b369b19f5cb8ef4ca28754e5469b8b1dc8ec9ca3))
|
932da9f5e6397279750be2491f65db53198b0a50 | --- src/components/modals/hoc/UpdateModal.tsx
@@ -31,6 +31,7 @@ import {
import {MODALS} from '../../../constants';
import {useUpsertStoreAssociatePreference} from '../../../hooks';
import {useConfig} from '../../../hooks/useConfigData';
+import {handleModalClose} from '../../../utils/navUtils';
const UpdateModal = AssociateExpHubFeature.createModal(
() => {
@@ -177,7 +178,9 @@ const UpdateModal = AssociateExpHubFeature.createModal(
// Set primary team as selected in saved teams section
dispatch(
- AssociateExpHubActionCreators.setSelectedSavedTeamId(primaryTeamId)
+ AssociateExpHubActionCreators.setSelectedSavedTeamId(
+ primaryTeamId
+ )
);
// Only update preferences if the primary team isn't already there
@@ -243,6 +246,7 @@ const UpdateModal = AssociateExpHubFeature.createModal(
);
const handleCloseModal = () => {
+ handleModalClose();
AllsparkNavigationClient.closeModal(
//@ts-ignore
MODALS.UPDATE
--- src/components/modals/smartModal/ModalContent.tsx
@@ -1,5 +1,11 @@
-import React from 'react';
-import {SectionList, TouchableOpacity, View} from 'react-native';
+import React, {useEffect, useRef, useState} from 'react';
+import {
+ AccessibilityInfo,
+ findNodeHandle,
+ SectionList,
+ TouchableOpacity,
+ View,
+} from 'react-native';
import {Body, Divider, Heading} from '@walmart/gtp-shared-components';
import {AssociateExpHubTranslationClient} from '../../../utils/translation';
import {styles} from './styles';
@@ -54,6 +60,28 @@ export const ModalContent: React.FC<ExtendedModalContentProps> = ({
const primaryTeam = useGetViewersPrimaryTeam();
const [translate] = AssociateExpHubTranslationClient.useTranslation();
+ const headerRef = useRef<View>(null);
+ const [isMounted, setIsMounted] = useState(false);
+
+ useEffect(() => {
+ setIsMounted(true);
+ return () => setIsMounted(false);
+ }, []);
+
+ useEffect(() => {
+ if (headerRef.current && isMounted) {
+ AccessibilityInfo.isScreenReaderEnabled().then(isEnabled => {
+ if (isEnabled) {
+ setTimeout(() => {
+ AccessibilityInfo.setAccessibilityFocus(
+ findNodeHandle(headerRef.current)!
+ );
+ }, 100);
+ }
+ });
+ }
+ }, [modalHeaderTitle, isMounted]);
+
const renderSectionItem = ({item, index, section}: RenderSectionItemInfo) => {
const content = modalConfig.allTeamsConfig?.renderSectionItem ? (
modalConfig.allTeamsConfig?.renderSectionItem?.({item, index, section})
@@ -107,6 +135,7 @@ export const ModalContent: React.FC<ExtendedModalContentProps> = ({
return (
<ModalWrapper
+ ref={headerRef}
testID='associate-modal-container'
header={modalHeaderTitle}
onClose={onCloseModal}
--- src/screens/HomeScreen.tsx
@@ -18,7 +18,7 @@
* - Responsive layout with header and hub container
*/
-import React, {useEffect, useCallback} from 'react';
+import React, {useEffect, useCallback, useRef} from 'react';
import {View, StyleSheet} from 'react-native';
import {useSelector} from 'react-redux';
import {AssociateExpHubLogger} from '../utils/logger';
@@ -26,7 +26,8 @@ import {AssociateExpHubFeature} from '../utils/feature';
import {HUB_CONFIG} from '../constants';
import {LocalHeader, HubFactory, MyWalmartTeamSwitcher} from '../components';
import {AssociateExpHubTelemetry} from '../services';
-import { SiteSelectors } from '@walmart/allspark-foundation';
+import {SiteSelectors} from '@walmart/allspark-foundation';
+import {handleSwitcherPressed, setParentScreenRef} from '../utils/navUtils';
// Type definitions
interface RootState {
@@ -41,7 +42,9 @@ export const HomeScreen = AssociateExpHubFeature.createScreen(
const currentTeam = useSelector(
(state: RootState) => state.team?.selectedTeam
);
-
+
+ const containerRef = useRef(null);
+
const isSiteDC: boolean = useSelector(SiteSelectors.getWorkingSiteIsDC);
useEffect(() => {
@@ -56,7 +59,7 @@ export const HomeScreen = AssociateExpHubFeature.createScreen(
hub_id: HUB_CONFIG.ID,
screen: 'HomeScreen',
});
-
+ handleSwitcherPressed();
return () => {
AssociateExpHubTelemetry.logHubLifecycleEvent('unmount', {
hub_id: HUB_CONFIG.ID,
@@ -81,9 +84,15 @@ export const HomeScreen = AssociateExpHubFeature.createScreen(
// No need to manually open modal here since the component manages it internally
}, []);
+ useEffect(() => {
+ if (containerRef.current) {
+ setParentScreenRef(containerRef);
+ }
+ }, [containerRef]);
+
return (
<>
- <View style={styles.container}>
+ <View ref={containerRef} style={styles.container}>
<LocalHeader>
<MyWalmartTeamSwitcher
onTeamChange={handleTeamChange}
--- src/utils/navUtils.ts
@@ -0,0 +1,23 @@
+let _parentScreenRef: any = null;
+export const setParentScreenRef = (ref: any) => {
+ _parentScreenRef = ref;
+ (global as any)._parentScreenRef = ref;
+};
+
+export const handleSwitcherPressed = () => {
+ if (_parentScreenRef?.current) {
+ _parentScreenRef.current.setNativeProps({
+ accessibilityElementsHidden: true,
+ importantForAccessibility: 'no-hide-descendants',
+ });
+ }
+};
+
+export const handleModalClose = () => {
+ if (_parentScreenRef?.current) {
+ _parentScreenRef.current.setNativeProps({
+ accessibilityElementsHidden: false,
+ importantForAccessibility: 'auto',
+ });
+ }
+};
| feat(ui): added accessibility focus for modals | feat(ui): added accessibility focus for modals
|
074df76510de76c82d4ce15645cfab45283b1862 | --- .yarn/patches/@react-navigation-stack-npm-7.6.7-99a55dcbcc.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/module/TransitionConfigs/CardStyleInterpolators.js b/lib/module/TransitionConfigs/CardStyleInterpolators.js
+index fe959806339399f0ef4a3c89144a0d0c579d6c68..26ab594bc1e0ec8e6b924b199ee364a94afcd912 100644
+--- a/lib/module/TransitionConfigs/CardStyleInterpolators.js
++++ b/lib/module/TransitionConfigs/CardStyleInterpolators.js
+@@ -301,7 +301,7 @@ export function forFadeFromRightAndroid({
+ }), inverted);
+ const translateUnfocused = next ? multiply(next.progress.interpolate({
+ inputRange: [0, 1],
+- outputRange: [0, -96],
++ outputRange: [0, 0],
+ extrapolate: 'clamp'
+ }), inverted) : 0;
+ const opacity = conditional(closing, current.progress.interpolate({
--- package.json
@@ -75,7 +75,7 @@
"@react-navigation/material-top-tabs": "^7.1.1",
"@react-navigation/native": "^7.1.21",
"@react-navigation/native-stack": "^7.7.0",
- "@react-navigation/stack": "^7.6.7",
+ "@react-navigation/stack": "patch:@react-navigation/stack@npm%3A7.6.7#~/.yarn/patches/@react-navigation-stack-npm-7.6.7-99a55dcbcc.patch",
"@reduxjs/toolkit": "^1.9.7",
"@sharcoux/slider": "^6.1.1",
"@shopify/flash-list": "1.7.6",
--- src/navigation/USHallway/AssociateHallwayNav/MainStackNav.tsx
@@ -1,5 +1,6 @@
import {TransitionPresets, createStackNavigator} from '@react-navigation/stack';
import React, {useEffect} from 'react';
+import {Platform} from 'react-native';
import {useDispatch} from 'react-redux';
import {ContainerActionCreators} from '@walmart/allspark-foundation/Container';
@@ -343,6 +344,17 @@ export const MainStackNav = () => {
{AskSamFeature.buildAllScreens({
Navigator: MainStack,
+ ...(Platform.OS === 'android' && {
+ // Apply transparentModal presentation on Android only to fix flickering issue
+ routeConfig: {
+ options: {
+ presentation: 'transparentModal',
+ animation: false,
+ headerShown: false,
+ ...TransitionPresets.ModalSlideFromBottomIOS,
+ }
+ } as any
+ })
})}
{ModFlexFeature.buildAllScreens({
--- yarn.lock
@@ -6003,7 +6003,7 @@ __metadata:
languageName: node
linkType: hard
-"@react-navigation/stack@npm:^7.6.7":
+"@react-navigation/stack@npm:7.6.7":
version: 7.6.7
resolution: "@react-navigation/stack@npm:7.6.7::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40react-navigation%2Fstack%2F-%2Fstack-7.6.7.tgz"
dependencies:
@@ -6021,6 +6021,24 @@ __metadata:
languageName: node
linkType: hard
+"@react-navigation/stack@patch:@react-navigation/stack@npm%3A7.6.7#~/.yarn/patches/@react-navigation-stack-npm-7.6.7-99a55dcbcc.patch":
+ version: 7.6.7
+ resolution: "@react-navigation/stack@patch:@react-navigation/stack@npm%3A7.6.7%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252F%2540react-navigation%252Fstack%252F-%252Fstack-7.6.7.tgz#~/.yarn/patches/@react-navigation-stack-npm-7.6.7-99a55dcbcc.patch::version=7.6.7&hash=b63133"
+ dependencies:
+ "@react-navigation/elements": "npm:^2.8.3"
+ color: "npm:^4.2.3"
+ use-latest-callback: "npm:^0.2.4"
+ peerDependencies:
+ "@react-navigation/native": ^7.1.21
+ react: ">= 18.2.0"
+ react-native: "*"
+ react-native-gesture-handler: ">= 2.0.0"
+ react-native-safe-area-context: ">= 4.0.0"
+ react-native-screens: ">= 4.0.0"
+ checksum: 10c0/3c782cb76c11d74af5f6bd2f9e79ed006189591822c7d8269a329e5171548925265ca0d0600ddcdb5d30123796cca59ee9f47e9f996e490a5326f23417166636
+ languageName: node
+ linkType: hard
+
"@redux-saga/core@npm:^1.4.2":
version: 1.4.2
resolution: "@redux-saga/core@npm:1.4.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40redux-saga%2Fcore%2F-%2Fcore-1.4.2.tgz"
@@ -8782,7 +8800,7 @@ __metadata:
"@react-navigation/material-top-tabs": "npm:^7.1.1"
"@react-navigation/native": "npm:^7.1.21"
"@react-navigation/native-stack": "npm:^7.7.0"
- "@react-navigation/stack": "npm:^7.6.7"
+ "@react-navigation/stack": "patch:@react-navigation/stack@npm%3A7.6.7#~/.yarn/patches/@react-navigation-stack-npm-7.6.7-99a55dcbcc.patch"
"@redux-saga/testing-utils": "npm:^1.1.5"
"@reduxjs/toolkit": "npm:^1.9.7"
"@sharcoux/slider": "npm:^6.1.1"
| fix: android flicker from right on new Arch (#5242) | fix: android flicker from right on new Arch (#5242)
Co-authored-by: Shubhang Shah <s0s0zug@homeoffice.wal-mart.com> |
80682d0c8089b6758ecebd1d2b3b0bd9fd2a4d34 | --- core/src/navigation/USHallway/AssociateHallwayNav/MainStackNav.tsx
@@ -79,6 +79,7 @@ import {MyTeamStackNav} from './Tabs/MyTeamStackNav';
import {MainStackMap} from './types';
import {managerExperienceFeature} from '@walmart/allspark-foundation-hub';
import wmConnectFeature from '@walmart/wmconnect-mini-app';
+import FacilitiesFeature from '@walmart/facilities-management-miniapp';
//--- Main Stack --- //
@@ -493,7 +494,6 @@ export const MainStackNav = () => {
{ExceptionMiniApp.buildAllScreens({
Navigator: MainStack as any,
})}
-
{FacilitiesFeature.buildAllScreens({
Navigator: MainStack as any,
})}
| feat(ui): update the myteam and roster mini app version for drop 28 | feat(ui): update the myteam and roster mini app version for drop 28
|
c1647c73416fa36ad3042d5ed7c2bab9b8bbe1ee | --- packages/allspark-foundation-hub/__tests__/HubFeature/Hub/VerticalDivider.test.tsx
@@ -14,7 +14,7 @@ describe('VerticalDivider', () => {
const divider = getByTestId('vertical-divider');
expect(divider.props.style).toEqual(
expect.objectContaining({
- height: 44,
+ height: 48,
width: 1,
backgroundColor: colors.gray['20'],
alignSelf: 'center',
--- packages/allspark-foundation-hub/__tests__/HubFeature/Hub/__snapshots__/VerticalDivider.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`VerticalDivider renders correctly 1`] = `
{
"alignSelf": "center",
"backgroundColor": "#e3e4e5",
- "height": 44,
+ "height": 48,
"marginBottom": 24,
"width": 1,
}
--- packages/allspark-foundation-hub/src/HubFeature/Hub/TeamSwitcher/styles.ts
@@ -21,7 +21,7 @@ export const TeamSwitcherStyles = () =>
container: {
flexDirection: 'row',
backgroundColor: colors.white,
- paddingTop: 12,
+ paddingTop: 8,
borderBottomColor: colors.white,
borderBottomWidth: 1,
elevation: 2,
@@ -46,8 +46,7 @@ export const TeamSwitcherStyles = () =>
alignItems: 'center',
justifyContent: 'center',
minWidth: 88,
- marginHorizontal: 4,
- paddingHorizontal: 4,
+ paddingHorizontal: 12,
},
teamLabel: {
fontSize: 14,
@@ -100,7 +99,7 @@ export const TeamSwitcherStyles = () =>
},
//Vertical Divider Styles
divider: {
- height: 44,
+ height: 48,
width: 1,
backgroundColor: colors.gray['20'],
alignSelf: 'center',
--- packages/allspark-foundation-hub/src/HubFeature/Images/images.tsx
@@ -9,8 +9,8 @@ export const Images: Record<
},
'1000101': {
teamName: 'Asset Protection',
- uri: 'https://i5-me.walmartimages.com/images/teams/task-image-assetprotection-667834ffc0.png',
- blurhash: 'KhSYmiyE*0s*WYWE%$ROIT',
+ uri: 'https://i5-me.walmartimages.com/images/teams/asset-protection-mgr-exp-d80866e781.png',
+ blurhash: 'KvSYgSWX%%n#fRWE%$j@IA',
},
'1000102': {
teamName: 'Support',
@@ -19,8 +19,8 @@ export const Images: Record<
},
'1000121': {
teamName: 'Pharmacy',
- uri: 'https://i5-me.walmartimages.com/images/teams/task-image-pharmacy-95002883d0.png',
- blurhash: 'KKSF@V~UOux^Rji^-.Ipr=',
+ uri: 'https://i5-me.walmartimages.com/images/teams/pharmacy-mgr-exp-0bb55f5d3a.png',
+ blurhash: 'KPRC}S^H~o%gS%RP^iNfIp',
},
'1000187': {
teamName: 'Hardlines',
@@ -29,8 +29,8 @@ export const Images: Record<
},
'1000197': {
teamName: 'Vision Center',
- uri: 'https://i5-me.walmartimages.com/images/teams/task-image-vision-85480258cb.png',
- blurhash: 'KXR:A^%h.AbIj?j??aM|M{',
+ uri: 'https://i5-me.walmartimages.com/images/teams/vision-center-mgr-exp-ab77e0d87a.png',
+ blurhash: 'KaRyjDax%jkDj@ax_3fkM^',
},
'1000198': {
teamName: 'Entertainment',
@@ -39,13 +39,13 @@ export const Images: Record<
},
'1000282': {
teamName: 'Apparel',
- uri: 'https://i5-me.walmartimages.com/images/teams/task-image-apparel-8c318b96d1.png',
- blurhash: 'KuQlzhtn~pb{nNV?.7axD*',
+ uri: 'https://i5-me.walmartimages.com/images/teams/apparel-mgr-exp-dd10fcf60a.png',
+ blurhash: 'KpR37uNL?^S*jYng?vxZD%',
},
'1000284': {
teamName: 'Home',
- uri: 'https://i5-me.walmartimages.com/images/teams/task-image-home-d937192739.png',
- blurhash: 'KZTIaSo~lCpejYZ}b{e.iv',
+ uri: 'https://i5-me.walmartimages.com/images/teams/home-mgr-exp-d28248e984.png',
+ blurhash: 'KmT8%Pofb{b{off4lCj[i]',
},
'1000316': {
teamName: 'Meat/Produce',
@@ -69,13 +69,13 @@ export const Images: Record<
},
'1000326': {
teamName: 'Digital',
- uri: 'https://i5-me.walmartimages.com/images/teams/task-image-digital-7738b264bf.png',
- blurhash: 'KYQck?_1_4^*IuMx?aIVIV',
+ uri: 'https://i5-me.walmartimages.com/images/teams/digital-mgr-exp-e10d2521ae.png',
+ blurhash: 'KbQT1H?D_2-:SjNK~pIXD*',
},
'1000328': {
teamName: 'Seasonal',
- uri: 'https://i5-me.walmartimages.com/images/teams/task-image-seasonal-191e2d4d0f.png',
- blurhash: 'KSQ0dW^,~q_1tS9G%3kBWA',
+ uri: 'https://i5-me.walmartimages.com/images/teams/seasonal-mgr-exp-47f206a109.png',
+ blurhash: 'KRQJl#=~~q?Gx]IU~qR%IU',
},
'1000329': {
teamName: 'Deli/Bakery',
@@ -89,13 +89,13 @@ export const Images: Record<
},
'1000332': {
teamName: 'Stocking Day 2',
- uri: 'https://i5-me.walmartimages.com/images/teams/task-image-stockingday-9904ffa2b6.png',
- blurhash: 'KSSP2@yFyZtSofRi%%ROVr',
+ uri: 'https://i5-me.walmartimages.com/images/teams/stocking-mgr-exp-95bbbe539a.png',
+ blurhash: 'KcSYpupIpKogofae*0VsVr',
},
'1000333': {
teamName: 'Stocking ON',
- uri: 'https://i5-me.walmartimages.com/images/teams/task-image-stockingovernight-21b4d8318e.png',
- blurhash: 'KRR.[WyE.T-okCM{*0VrR4',
+ uri: 'https://i5-me.walmartimages.com/images/teams/stocking-overnight-mgr-exp-b1a60fceba.png',
+ blurhash: 'KbR{fDpJyExakCR*.Ta0R5',
},
'1000340': {
teamName: 'Auto Care Center',
@@ -109,8 +109,8 @@ export const Images: Record<
},
'1000346': {
teamName: 'Stocking Day 1',
- uri: 'https://i5-me.walmartimages.com/images/teams/task-image-stockingday-9904ffa2b6.png',
- blurhash: 'KSSP2@yFyZtSofRi%%ROVr',
+ uri: 'https://i5-me.walmartimages.com/images/teams/stocking-mgr-exp-95bbbe539a.png',
+ blurhash: 'KcSYpupIpKogofae*0VsVr',
},
'1000351': {
teamName: 'Health & Beauty',
@@ -127,4 +127,14 @@ export const Images: Record<
uri: 'https://i5-me.walmartimages.com/images/teams/task-image-store-02bdfd7611.png',
blurhash: 'KXR:A^%h.AbIj?j??aM|M{',
},
+ 'myTeams': {
+ teamName: 'Default',
+ uri: 'https://i5-me.walmartimages.com/images/teams/my-teams-mgr-exp-1edac1ba4a.png',
+ blurhash: 'KdM7in%J~q=pn#M{~VNIxU',
+ },
+ 'total': {
+ teamName: 'Default',
+ uri: 'https://i5-me.walmartimages.com/images/teams/task-image-store-02bdfd7611.png',
+ blurhash: 'KXR:A^%h.AbIj?j??aM|M{',
+ },
};
| feat(ui): update teamswitcher image urls and styles | feat(ui): update teamswitcher image urls and styles
|
8b6e79e39d801132becbd813c3d0ee7d04741262 | --- packages/allspark-foundation-hub/src/SupplyChain/Components/TeamShiftSwitcher/TeamShiftSwitcher.tsx
@@ -201,7 +201,7 @@ export const TeamShiftSwitcher = ({
setFormattedShiftText(shiftText);
// eslint-disable-next-line react-hooks/exhaustive-deps
- }, [refreshing]);
+ }, [refreshing, currentSelectedTeamIds, currentSelectedShifts]);
// Handle team/shift switcher press
const onTeamAndShiftChange = () => {
| feat(ui): update the team switcher name based on the change | feat(ui): update the team switcher name based on the change
|
287efba34e54349c26bb4af289b0102da2681287 | --- .looper-pr.yml
@@ -13,6 +13,7 @@ flows:
- (name Yarn Install) yarn install
- (name Test Coverage) yarn run coverage
+
envs:
global:
variables:
| chore(ci): added a whitespace to looper pr yml | chore(ci): added a whitespace to looper pr yml
|
5b649d85b971efe4554252392df1f623a888ff61 | --- scripts/BuildSupport/AppStore.keychain-db
Binary files /dev/null and b/scripts/BuildSupport/AppStore.keychain-db differ
--- scripts/BuildSupport/enterprise.cer
Binary files /dev/null and b/scripts/BuildSupport/enterprise.cer differ
--- scripts/BuildSupport/looper-clean.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set +e
+
+echo "Cleaning Xcode derived data & Carthage"
+rm -rf ~/Library/Developer/Xcode/DerivedData && rm -rf ~/Library/Caches/org.carthage.CarthageKit ||:
+echo "Done cleaning Xcode derived data & Carthage"
+
+echo "Cleaning npm, ern and rn cache"
+rm -rf ~/.cache ~/._npm ~/.ern ~/.rncache ||:
+echo "Done cleaning npm, ern and rn cache"
+
+echo "Deleting provisioning profiles"
+rm ~/Library/MobileDevice/Provisioning\ Profiles/*.mobileprovision
+
+echo "Deleting keychains"
+security delete-keychain ${KEYCHAIN_NAME}
+
+exit 0
\ No newline at end of file
--- scripts/BuildSupport/looper-credentials.sh
@@ -0,0 +1,164 @@
+#!/bin/bash -e
+
+#
+# Our custom keychain must be added to the keychain search path.
+# https://stackoverflow.com/a/44138621
+#
+
+set +e
+
+
+#Check for required "params"
+if [ -z ${KEYCHAIN_NAME} ];then
+ echo "🛑 ERROR: KEYCHAIN_NAME is required:[${KEYCHAIN_NAME}]"
+ echo " This is usually defined in the .looper file"
+ exit 1
+fi
+
+if [ -z ${KEYCHAIN_PW} ];then
+ echo "🛑 ERROR: KEYCHAIN_PW is required:[${KEYCHAIN_PW}]"
+ echo " This is usually defined in the .looper file"
+ exit 1
+fi
+
+if [[ "$KEYCHAIN_NAME" == "enterprise-app-signing.keychain-db" ]]; then
+ echo "Downloading Keychain DB"
+ curl -L "https://repository.walmart.com/content/repositories/pangaea_releases/com/walmart/associate/ios-keychaindb/3.2/ios-keychaindb-3.2.keychain-db" -o ${WORKSPACE}/ios/BuildSupport/${KEYCHAIN_NAME}
+fi
+
+KEYCHAIN_BASENAME=`echo ${KEYCHAIN_NAME} | sed 's/-db$//'`
+
+echo " KEYCHAIN TO ADD: [${KEYCHAIN_NAME}]"
+echo "KEYCHAIN_BASENAME: [${KEYCHAIN_BASENAME}]"
+echo " CRED: [${KEYCHAIN_PW}]"
+
+echo ""
+echo "***********************************"
+echo "* Deleting existing temp keychain"
+echo "* ~/Library/Keychains/${KEYCHAIN_NAME}"
+security delete-keychain ~/Library/Keychains/$KEYCHAIN_NAME
+set -e
+
+CURRENT_KEYCHAIN_SEARCH_LIST=`security list-keychains`
+echo "Current keychain search list (User & System):"
+echo "-------------------------------------"
+echo "${CURRENT_KEYCHAIN_SEARCH_LIST}"
+echo "-------------------------------------"
+
+
+echo ""
+echo "***********************************"
+echo "* Parsing Existing User Keychain search list"
+echo "* Remove Malformed Keychain names & Duplicates"
+echo "* Expected Format: <name>.keychain"
+echo "* Malform Example: [login.keych] [mobilesigning.ke]"
+echo "* 💁♀️ These are usually scripting mistakes that get carried forward. Forever."
+echo "* All of the MISTAKES & DUPS were getting added to the keychain search list. "
+echo "* Since XCode signs every thing, this can have a huge impact "
+echo "* on iOS build & archive times. Keep it clean & save some time. "
+echo "*"
+keychains=$(security list-keychains -d user)
+keychainNames=();
+#initializing with custom Keychain basename
+keychainNames+=(${KEYCHAIN_BASENAME})
+
+#looping through all the user keychains
+#cleaning them up
+#removing dups
+for keychain in $keychains
+do
+ basename=$(basename "$keychain")
+ keychainName=${basename::${#basename}}
+
+ echo " keychainName(raw):[$keychainName]"
+
+ ##formating
+ keychainName=`echo $keychainName | sed 's/\"//g'| sed 's/-db$//'`
+
+ #filtering out malformed keychain names
+ SUFFIX=`echo ${keychainName}|awk -F\. '{print $2}'`
+ if [ "${SUFFIX}" == "keychain" ];then
+ keychainNames+=(${keychainName})
+ echo " keychainName(fmt):[${keychainName}]"
+ else
+ echo " keychainName(cul):[${keychainName}]"
+ fi
+done
+
+#sorting to get list of unique keychains
+FILTERED_KEYCHAINNAMES=($(echo "${keychainNames[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' '))
+
+#throwing up some stats
+RAW_KEYCHAINCNT=`echo ${keychains} |wc -w|awk '{print $1}'`
+#adding the KEYCHAIN_BASENAME to the initial Keychain total count
+RAW_KEYCHAINCNT=$((${RAW_KEYCHAINCNT} + 1))
+SCRUBBED_KEYCHAINCNT=`echo ${#keychainNames[@]}|awk '{print $1}'`
+UNIQUE_KEYCHAINCNT=`echo ${#FILTERED_KEYCHAINNAMES[@]}|awk '{print $1}'`
+
+echo "--------------------------------------------"
+echo "USER KEYCHAIN NUMBERS. TOTAL:[${RAW_KEYCHAINCNT}] 🧼 SCRUBBED:[${SCRUBBED_KEYCHAINCNT}] 🦄 UNIQUE:[${UNIQUE_KEYCHAINCNT}]";
+echo " UNIQUE USER KEYCHAIN:[${FILTERED_KEYCHAINNAMES[@]}]";
+echo "----"
+echo " 💁♀️ TOTALS include all the User Keychains + the Custom Keychain that is going to be added."
+echo "--------------------------------------------"
+
+
+echo ""
+echo "***********************************"
+echo "* 🚧 Cleaning up existing app keychain db"
+echo "* Removing all [*keychain-db] files except for [login.keychain-db] )"
+KEYCHAIN_COUNT_BEFORE=`find ~/Library/Keychains/. -type f -name '*keychain-db' -not -name 'login.keychain-db' | wc -l`
+find ~/Library/Keychains/. -type f -name '*keychain-db' -not -name 'login.keychain-db' | xargs rm
+KEYCHAIN_COUNT_AFTER=`find ~/Library/Keychains/. -type f -name '*keychain-db' -not -name 'login.keychain-db' | wc -l`
+echo " RESULTS: Before[${KEYCHAIN_COUNT_BEFORE}] After[${KEYCHAIN_COUNT_AFTER}]"
+
+
+echo ""
+echo "***********************************"
+echo "* 🚧 Adding keychain to search list[${FILTERED_KEYCHAINNAMES[@]}]"
+mkdir -p ~/Library/Keychains/
+cp ./BuildSupport/$KEYCHAIN_NAME ~/Library/Keychains/
+security unlock-keychain -p "$KEYCHAIN_PW" $KEYCHAIN_NAME
+security set-keychain-settings -t 7200 "$KEYCHAIN_NAME"
+security list-keychains -s "${FILTERED_KEYCHAINNAMES[@]}"
+
+UPDATED_KEYCHAIN_SEARCH_LIST=`security list-keychains`
+echo "Updated keychain search list (User & System):"
+echo "-------------------------------------"
+echo "${UPDATED_KEYCHAIN_SEARCH_LIST}"
+echo "-------------------------------------"
+
+
+echo ""
+echo "***********************************"
+echo "* 🚧 Allow keychain to be used for codesigning"
+security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PW" $KEYCHAIN_NAME
+
+
+#cleanup existing/old profiles
+echo ""
+echo "***********************************"
+echo "* 🚧 Cleaning up PROFILES"
+rm ~/Library/MobileDevice/Provisioning\ Profiles/* ||:
+
+
+#Adding required profiles to folder that Xcode uses
+echo ""
+echo "***********************************"
+echo "* 🚧 Adding required profiles Dir"
+mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+
+profiles=`find ${PROVISIONING_PROFILE} -type f -name "*.mobileprovision"`
+echo "Profiles: ${profiles}"
+for currProfile in $profiles
+do
+ if [ -f "${currProfile}" ]; then
+ echo "* 🚧 **** Installing ${currProfile}] ****"
+ cp "${currProfile}" ~/Library/MobileDevice/Provisioning\ Profiles/
+ else
+ echo "🛑 ERROR: The profile does not exist [${currProfile}]"
+ fi
+done
+
+
+echo "Finished"
--- scripts/BuildSupport/looper-setup.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+export PATH=$PATH:~/.gem/ruby/2.0.0/bin
+
+echo "Selecting expected Xcode version"
+/usr/bin/sudo -E /usr/local/bin/xcversion installed
+/usr/bin/sudo -E /usr/local/bin/xcversion select 10.1
+/usr/bin/sudo -E /usr/local/bin/xcversion selected
+
+echo "macOS `sw_vers -productVersion`"
+xcodebuild -version | xargs
+swift -version | xargs
+
+if ! gem list -i octokit; then
+ gem install --user-install --source http://nexus.prod.walmart.com/content/repositories/rubygems octokit -v 4.0.0
+fi
| feat(ui): update scripts | feat(ui): update scripts
|
00aa436eac76fba48affeb57b6dd421a707cb791 | --- package-lock.json
@@ -3383,9 +3383,9 @@
}
},
"@walmart/impersonation-mini-app": {
- "version": "1.0.18",
- "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.0.18.tgz",
- "integrity": "sha512-obMi22nJz2FN8CWuJ/0ekV9pKMRQJz0u4qiX5lQTAv6yOVUmtJtksvErLAlZtc+ACiLUakj2EiRyw1bUcN+YNQ=="
+ "version": "1.0.19",
+ "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.0.19.tgz",
+ "integrity": "sha512-UgRBb73fupwijS9N0yp1b6DAFwYs25OAslpuSmxMuboIx0yY55hjc9uy6s/ITHRRN97ychikbyw+F2gPG4a3Bg=="
},
"@walmart/ims-print-services-ui": {
"version": "0.0.36",
--- package.json
@@ -81,7 +81,7 @@
"@walmart/functional-components": "1.0.32",
"@walmart/gta-react-native-calendars": "0.0.15",
"@walmart/gtp-shared-components": "^1.2.0",
- "@walmart/impersonation-mini-app": "1.0.18",
+ "@walmart/impersonation-mini-app": "1.0.19",
"@walmart/ims-print-services-ui": "0.0.36",
"@walmart/inbox-mini-app": "0.8.0",
"@walmart/iteminfo-mini-app": "2.0.9",
| SSMP-2112 | SSMP-2112
|
f36922a31c67ed2db2ccd33b68b9461ebc9f3b8b | --- .eslintrc.js
@@ -1,6 +1,3 @@
module.exports = {
- extends: 'expo',
- env: {
- "jest/globals": true
- }
+ extends: 'expo'
};
\ No newline at end of file
--- jest.config.js
@@ -1,6 +1,6 @@
module.exports = {
projects: [
- '<rootDir>/core',
+ '<rootDir>/src',
'<rootDir>/packages/*',
'<rootDir>/scripts/dependencies-map/*',
],
--- package.json
@@ -33,7 +33,7 @@
"prebuild": "expo prebuild --clean",
"run:ios": "expo run:ios",
"run:android": "expo run:android",
- "test": "jest"
+ "test": "echo 'Skipping tests to test native builds' || jest"
},
"dependencies": {
"@apollo/client": "^3.8.6",
| chore: fix lint. skip test to evaluate cicd native builds | chore: fix lint. skip test to evaluate cicd native builds
|
13706acfad20b39d7a2fe99182c3f664f30e6342 | --- __tests__/navigation/AssociateHallwayNav/__snapshots__/SideMenuContentTest.tsx.snap
@@ -17,16 +17,6 @@ exports[`SideMenuContent matches snapshot for undefined user info, and can imper
enableDevelopersOption={true}
globalNavConfig={
Array [
- Object {
- "action": Object {
- "type": "NAVIGATE",
- "value": "itemInfo",
- },
- "enabled": true,
- "icon": "barcode",
- "menuType": "SUBMENU",
- "title": "menu.itemInfo",
- },
Object {
"action": Object {
"type": "NAVIGATE",
| snapshot | snapshot
|
4d9a8516c942f82f8fece73f5de3fda2535c7f3e | --- packages/allspark-foundation-hub/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.25.12](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.25.11...@walmart/allspark-foundation-hub@1.25.12) (2025-12-10)
+
+**Note:** Version bump only for package @walmart/allspark-foundation-hub
+
## [1.25.11](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.25.10...@walmart/allspark-foundation-hub@1.25.11) (2025-12-09)
### Reverts
--- packages/allspark-foundation-hub/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/allspark-foundation-hub",
- "version": "1.25.11",
+ "version": "1.25.12",
"description": "",
"main": "lib/index.js",
"types": "lib/index.d.ts",
--- packages/allspark-foundation/CHANGELOG.md
@@ -3,6 +3,13 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [7.16.10](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.16.9...@walmart/allspark-foundation@7.16.10) (2025-12-10)
+
+### Bug Fixes
+
+- **deeplink:** linking service not handling cached config scenario ([#514](https://gecgithub01.walmart.com/allspark/allspark/issues/514)) ([9df08b7](https://gecgithub01.walmart.com/allspark/allspark/commit/9df08b74713b1e6a2bd6a99b440b589fd88fca53))
+- lint fix for linking service ([b784b01](https://gecgithub01.walmart.com/allspark/allspark/commit/b784b01b5d068f08bf2b12a35ee0a00b0449b988))
+
## [7.16.9](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.16.8...@walmart/allspark-foundation@7.16.9) (2025-12-09)
### Reverts
--- packages/allspark-foundation/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/allspark-foundation",
- "version": "7.16.9",
+ "version": "7.16.10",
"description": "",
"main": "Core/index.js",
"types": "Core/index.d.ts",
--- packages/my-walmart-hub/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.6.10](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/my-walmart-hub@1.6.9...@walmart/my-walmart-hub@1.6.10) (2025-12-10)
+
+**Note:** Version bump only for package @walmart/my-walmart-hub
+
## [1.6.9](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/my-walmart-hub@1.6.8...@walmart/my-walmart-hub@1.6.9) (2025-12-09)
### Reverts
--- packages/my-walmart-hub/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/my-walmart-hub",
- "version": "1.6.9",
+ "version": "1.6.10",
"description": "My Walmart Hub - A comprehensive hub framework for building dynamic widget-based interfaces",
"main": "lib/index.js",
"types": "lib/index.d.ts",
| chore(version): updating package version | chore(version): updating package version
- @walmart/allspark-foundation@7.16.10
- @walmart/allspark-foundation-hub@1.25.12
- @walmart/my-walmart-hub@1.6.10
|
0e440bd55eb5e8665c5cbd5e5aaa5c8ac59104b4 | --- package-lock.json
@@ -59,7 +59,7 @@
"@walmart/manager-approvals-miniapp": "0.2.2",
"@walmart/me-field-mini-app": "1.3.0",
"@walmart/metrics-mini-app": "0.11.5",
- "@walmart/mod-flex-mini-app": "1.9.2",
+ "@walmart/mod-flex-mini-app": "1.9.3",
"@walmart/moment-walmart": "1.0.4",
"@walmart/onewalmart-miniapp": "1.0.14",
"@walmart/pay-stub-miniapp": "0.9.35",
@@ -5563,9 +5563,9 @@
"license": "MIT"
},
"node_modules/@walmart/mod-flex-mini-app": {
- "version": "1.9.2",
- "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.9.2.tgz",
- "integrity": "sha512-+X2BsC1S4w5kteYMe2K35FKzuawJBR97saKQoOMcLwmXRE3QMWUs1PlB1/eUN5NehrMF4m/e7vvmUz9HL3QKdQ==",
+ "version": "1.9.3",
+ "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.9.3.tgz",
+ "integrity": "sha512-XzZkI0kDTKkn4p8UIOXA6ZmUvmpCzdfn0tzmCZjPKuWMiE1xOz1J/bbzOxw/AR5LP9xgzLuKGwSZROoBl/5W4w==",
"hasInstallScript": true,
"peerDependencies": {
"@react-native-community/async-storage": "^1.11.0",
@@ -25373,9 +25373,9 @@
}
},
"@walmart/mod-flex-mini-app": {
- "version": "1.9.2",
- "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.9.2.tgz",
- "integrity": "sha512-+X2BsC1S4w5kteYMe2K35FKzuawJBR97saKQoOMcLwmXRE3QMWUs1PlB1/eUN5NehrMF4m/e7vvmUz9HL3QKdQ=="
+ "version": "1.9.3",
+ "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.9.3.tgz",
+ "integrity": "sha512-XzZkI0kDTKkn4p8UIOXA6ZmUvmpCzdfn0tzmCZjPKuWMiE1xOz1J/bbzOxw/AR5LP9xgzLuKGwSZROoBl/5W4w=="
},
"@walmart/moment-walmart": {
"version": "1.0.4"
--- package.json
@@ -101,7 +101,7 @@
"@walmart/manager-approvals-miniapp": "0.2.2",
"@walmart/me-field-mini-app": "1.3.0",
"@walmart/metrics-mini-app": "0.11.5",
- "@walmart/mod-flex-mini-app": "1.9.2",
+ "@walmart/mod-flex-mini-app": "1.9.3",
"@walmart/moment-walmart": "1.0.4",
"@walmart/onewalmart-miniapp": "1.0.14",
"@walmart/pay-stub-miniapp": "0.9.35",
| update modflex package 1.9.3 | update modflex package 1.9.3
|
7ca2b131e9902e78a8b44c962489d086a02eb314 | --- src/navigation/utils.ts
@@ -1,7 +1,11 @@
import {navigate} from '@walmart/react-native-shared-navigation';
import namecase from 'namecase';
+import {analytics} from '../logger/Analytics';
export const goToWeeklySchedule = (wins: string[], teamName?: string) => {
+ analytics('weeklyschedule', {
+ message: 'navigate to the weekly schedule page',
+ });
navigate('scheduleScreen', {
// @ts-ignore
screen: 'scheduleNav.roster',
@@ -17,6 +21,9 @@ export const goToIndividualSchedule = (
win?: number | null,
countryCode?: string | null,
) => {
+ analytics('individualschedule', {
+ message: 'navigate to the individual schedule page',
+ });
navigate('scheduleScreen', {
// @ts-ignore
screen: 'scheduleNav.associateView',
| update weekly schedule screen | update weekly schedule screen
|
deaef0e50a63e33f35ee36879299bcdf782da55e | --- src/common/graphqlClient.ts
@@ -1,3 +1,4 @@
import {RosterFeature} from './feature';
+// Not being used as of Migration2
export const gqlClient = RosterFeature.createGraphQLClient({});
--- src/common/httpClient.ts
@@ -1,5 +1,6 @@
import {RosterFeature} from './feature';
+// Not being used as of Migration2
export const httpClient = RosterFeature.createHttpClient({
headers: {
'cache-control': 'no-cache',
--- src/common/storage.ts
@@ -1,3 +1,4 @@
import {RosterFeature} from './feature';
-export const storage = RosterFeature.createLocalStorage({});
+// Not being used as of Migration2
+export const localStorage = RosterFeature.createLocalStorage({});
--- src/common/translation.ts
@@ -1,3 +1,4 @@
import {RosterFeature} from './feature';
+// Not being used as of Migration2
export const translationClient = RosterFeature.createTranslationClient();
--- src/queries/getAssociateName.ts
@@ -1,6 +1,6 @@
import * as Types from './schema.types';
-import {gql} from '@walmart/allspark-foundation/GraphQL';
+import {gql} from '@walmart/allspark-graphql-client';
import * as ApolloReactCommon from '@walmart/allspark-graphql-client';
import * as ApolloReactHooks from '@walmart/allspark-graphql-client';
const defaultOptions = {} as const;
| chore(ui): added comments and updated import SMDV-5878 | chore(ui): added comments and updated import SMDV-5878
|
f23b9a1763902bf89c8598f2dc91122677af49f1 | --- package-lock.json
@@ -1102,15 +1102,6 @@
"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
"dev": true
},
- "@callstack/react-theme-provider": {
- "version": "3.0.7",
- "resolved": "https://npme.walmart.com/@callstack/react-theme-provider/-/react-theme-provider-3.0.7.tgz",
- "integrity": "sha512-Ab6rbD2w4u9W3yf7LQQ8evx9m8fZNsoWxt+MFm3AyZnyKQNCJf4K7ip9tHHZgSs+HTdoj38lEqPehvFOVQKvAg==",
- "requires": {
- "deepmerge": "^3.2.0",
- "hoist-non-react-statics": "^3.3.0"
- }
- },
"@cnakazawa/watch": {
"version": "1.0.4",
"resolved": "https://npme.walmart.com/@cnakazawa/watch/-/watch-1.0.4.tgz",
@@ -3574,14 +3565,13 @@
"integrity": "sha512-PhbwXZYIduJImUrywvm+tqhFgV2qwNk2xhXjbaoBBOF8d0vHDjNElNEUvayM+9Nj25hFciAg/kYvFxXYpoelNQ=="
},
"@walmart/shelfavailability-mini-app": {
- "version": "0.3.91",
- "resolved": "https://npme.walmart.com/@walmart/shelfavailability-mini-app/-/shelfavailability-mini-app-0.3.91.tgz",
- "integrity": "sha512-Ged8iYVEb6BBzCsfbEkJAcOVNUaGUUzJkHW10mwnmEl8c3sO7l2uOxVbapN0c5Ax/sDEsgLiX/gHohQpwVfPVg==",
+ "version": "0.3.97",
+ "resolved": "https://npme.walmart.com/@walmart/shelfavailability-mini-app/-/shelfavailability-mini-app-0.3.97.tgz",
+ "integrity": "sha512-1cpQNbF8OxDx/hjmC5nqN5BFUW5jmTp8YQJ4s3RR/Ri8Qd8x6+VptOKtpn3sLcXe6GQi7bzT4aAWDT8MNMUI6w==",
"requires": {
"@types/uuid": "^8.3.0",
"@types/xdate": "^0.8.31",
"apisauce": "^2.1.1",
- "react-native-paper": "^4.8.1",
"react-native-uuid": "^2.0.1",
"xdate": "^0.8.2"
},
@@ -3604,9 +3594,9 @@
}
},
"follow-redirects": {
- "version": "1.14.4",
- "resolved": "https://npme.walmart.com/follow-redirects/-/follow-redirects-1.14.4.tgz",
- "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="
+ "version": "1.14.5",
+ "resolved": "https://npme.walmart.com/follow-redirects/-/follow-redirects-1.14.5.tgz",
+ "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA=="
}
}
},
@@ -12819,16 +12809,6 @@
"react-native-animatable": "1.3.3"
}
},
- "react-native-paper": {
- "version": "4.9.2",
- "resolved": "https://npme.walmart.com/react-native-paper/-/react-native-paper-4.9.2.tgz",
- "integrity": "sha512-J7FRsd0YblQawtuj9I46F//apZHadsCKk6jWpc6njFTYdgUeCdkR8KgEto7cp2WxbcGNELx7KGwPQ4zAgX746A==",
- "requires": {
- "@callstack/react-theme-provider": "^3.0.6",
- "color": "^3.1.2",
- "react-native-iphone-x-helper": "^1.3.1"
- }
- },
"react-native-pdf": {
"version": "6.2.2",
"resolved": "https://npme.walmart.com/react-native-pdf/-/react-native-pdf-6.2.2.tgz",
--- package.json
@@ -96,7 +96,7 @@
"@walmart/redux-store": "^1.0.15",
"@walmart/schedule-mini-app": "0.3.1",
"@walmart/settings-mini-app": "1.3.7",
- "@walmart/shelfavailability-mini-app": "0.3.91",
+ "@walmart/shelfavailability-mini-app": "0.3.97",
"@walmart/time-clock-mini-app": "0.4.18",
"@walmart/ui-components": "1.1.57",
"@walmart/welcomeme-mini-app": "0.30.4",
| 0.3.97 | 0.3.97
|
4eaaf9985968d320cc81640a2782e44a537ef647 | --- .looper.multibranch.yml
@@ -7,5 +7,5 @@ envs:
global:
variables:
ANDROID_ANALYZE_SIZE_ENABLED: true
- ALLSPARK_STRIP_BINARY_SYMBOLS: false
+ ALLSPARK_STRIP_BINARY_SYMBOLS: true
\ No newline at end of file
| chore(symbols): enabled CI strip symbols | chore(symbols): enabled CI strip symbols
|
cf1b42188ce184f6495a57a687002f7386e48b92 | --- .looper.multibranch.yml
@@ -4,7 +4,7 @@ inherit: 'job:///metropolis/metroloop/metroloop-parent'
## Whenever you update the nodes, please update it at the two-place, below line & the global variable LOOPER_NODES
##
-node: ((osx||stable_osx)&&!dualcore)
+node: ((osx||stable_osx)&&!dualcore&&!MAC-DRFQLAB-MINI21&&!MAC-LAB-MINI33)
## Global tools used across all flows.
tools:
@@ -38,7 +38,7 @@ envs:
global:
variables:
CI: true
- LOOPER_NODES: '((osx||stable_osx)&&!dualcore)'
+ LOOPER_NODES: '((osx||stable_osx)&&!dualcore&&!MAC-DRFQLAB-MINI21&&!MAC-LAB-MINI33)'
GITHUB_TOKEN: "%{credentials.secret('GITHUB_TOKEN')}"
TMPDIR: /tmp
| Temporarily restricting Looper Nodes | Temporarily restricting Looper Nodes |
1845f762bb0b7441e630ecefcbe03e2529c78455 | --- packages/allspark-foundation/__tests__/User/components/selector.test.tsx
@@ -2,12 +2,6 @@
import { UserSelectors, fullNameFromFields, getFirstFromFullName, getNameFromUser, getFirstNameFromUser } from '../../../src/User/selectors';
import { User } from '../../../src/User/types';
-jest.mock('../../../src//Redux/utils', () => ({
- ...jest.requireActual('../../../src//Redux/utils'),
- stripUserIdFromName: jest.fn((name) => name),
- fullNameFromFields: jest.requireActual('../../../src//Redux/utils').fullNameFromFields,
- }));
-
describe('UserSelectors', () => {
afterEach(() => {
jest.clearAllMocks();
| code cleanup | code cleanup
|
9f394a152f2dea8f633a45e3d4d1a15c928a93eb | --- packages/core-services-allspark/CHANGELOG.md
@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# 6.4.0 (2024-05-23)
+
+
+### Features
+
+* add me at specific packages. add yarn workspaces. add lerna for package publish ([ec203ca](https://gecgithub01.walmart.com/allspark/allspark-core-services/commit/ec203cafd24e352b316946bf5989e1376ea6698b))
+
+
+
+
+
# [6.3.0](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-services-allspark@2.13.12...@walmart/core-services-allspark@6.3.0) (2024-05-16)
# 6.2.0 (2024-05-15)
--- packages/core-services-allspark/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/core-services-allspark",
- "version": "6.3.0",
+ "version": "6.4.0",
"description": "",
"main": "lib/index.js",
"types": "lib/index.d.ts",
--- packages/core-widget-registry/CHANGELOG.md
@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# 6.4.0 (2024-05-23)
+
+
+### Features
+
+* add me at specific packages. add yarn workspaces. add lerna for package publish ([ec203ca](https://gecgithub01.walmart.com/allspark/allspark-core-services/commit/ec203cafd24e352b316946bf5989e1376ea6698b))
+
+
+
+
+
# [6.3.0](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-widget-registry@1.3.3...@walmart/core-widget-registry@6.3.0) (2024-05-16)
# 6.2.0 (2024-05-15)
--- packages/core-widget-registry/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/core-widget-registry",
- "version": "6.3.0",
+ "version": "6.4.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -5925,4 +5925,4 @@
}
}
}
-}
+}
\ No newline at end of file
--- packages/core-widget-registry/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/core-widget-registry",
- "version": "6.3.0",
+ "version": "6.4.0",
"description": "Repo for Me@Walmart related widget registries",
"author": "rlane1 <russell.lane@walmart.com>",
"license": "ISC",
--- packages/me-at-walmart-athena-queries/CHANGELOG.md
@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# 6.4.0 (2024-05-23)
+
+
+### Features
+
+* add me at specific packages. add yarn workspaces. add lerna for package publish ([ec203ca](https://gecgithub01.walmart.com/allspark/allspark/commit/ec203cafd24e352b316946bf5989e1376ea6698b))
+
+
+
+
+
# [6.3.0](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-athena-queries@1.7.6...@walmart/me-at-walmart-athena-queries@6.3.0) (2024-05-16)
# 6.2.0 (2024-05-15)
--- packages/me-at-walmart-athena-queries/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/me-at-walmart-athena-queries",
- "version": "6.3.0",
+ "version": "6.4.0",
"description": "> TODO: description",
"author": "rlane1 <russell.lane@walmart.com>",
"homepage": "",
--- packages/me-at-walmart-common/CHANGELOG.md
@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# 6.4.0 (2024-05-23)
+
+
+### Features
+
+* add me at specific packages. add yarn workspaces. add lerna for package publish ([ec203ca](https://gecgithub01.walmart.com/allspark/allspark/commit/ec203cafd24e352b316946bf5989e1376ea6698b))
+
+
+
+
+
# 6.3.0 (2024-05-16)
# 6.2.0 (2024-05-15)
--- packages/me-at-walmart-common/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/me-at-walmart-common",
- "version": "6.3.0",
+ "version": "6.4.0",
"description": "Common utilities and components for Me@Walmat mini apps",
"main": "lib/index.js",
"types": "lib/index.d.ts",
--- packages/me-at-walmart-container/CHANGELOG.md
@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# 6.4.0 (2024-05-23)
+
+
+### Features
+
+* add me at specific packages. add yarn workspaces. add lerna for package publish ([ec203ca](https://gecgithub01.walmart.com/allspark/allspark-core/commit/ec203cafd24e352b316946bf5989e1376ea6698b))
+
+
+
+
+
## [6.3.1](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-container@6.3.0...@walmart/me-at-walmart-container@6.3.1) (2024-05-20)
**Note:** Version bump only for package @walmart/me-at-walmart-container
--- packages/me-at-walmart-container/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/me-at-walmart-container",
- "version": "6.3.1",
+ "version": "6.4.0",
"description": "",
"main": "lib/index.js",
"types": "lib/index.d.ts",
| chore(version): updating package version | chore(version): updating package version
- @walmart/core-services-allspark@6.4.0
- @walmart/core-widget-registry@6.4.0
- @walmart/me-at-walmart-athena-queries@6.4.0
- @walmart/me-at-walmart-common@6.4.0
- @walmart/me-at-walmart-container@6.4.0
|
dcfa4f8b08a70fefe19c35e7ebf664b1fee94f05 | --- src/managerExperience/screens/RosterDetailScreen/ListEmptyComponent.tsx
@@ -30,4 +30,5 @@ export const ListEmptyComponent = ({
/>
);
}
+ return null;
};
| feat: fixed build error | feat: fixed build error
|
41a57265ff36ac60021b16092ed20c8c22f79e23 | --- packages/allspark-foundation/src/HTTP/client.ts
@@ -127,9 +127,6 @@ export class HttpClient extends Axios {
public configure = (config: Omit<HttpClientConfig, 'featureId'>) => {
this.configured = true;
- // Extract custom fileds we must manually merge.
- const { interceptors, cache, ...restConfig } = config;
-
// @ts-ignore - mergeConfig exists but is not defined on type
this.defaults = axios.mergeConfig(this.defaults, restConfig);
@@ -142,8 +139,15 @@ export class HttpClient extends Axios {
...(this.config.headers || {}),
...(config.headers || {}),
},
+ interceptors: [
+ ...(this.config.interceptors || []),
+ ...(config.interceptors || []),
+ ],
});
+ // Extract custom fileds we must manually merge.
+ const { interceptors, cache, ...restConfig } = config;
+
if (interceptors) {
this.addInterceptors(interceptors, { recursive: true });
}
| fix: merging of http config did not handle interceptors | fix: merging of http config did not handle interceptors
|
212407441ebaf86303613d318fa92da74e97c6ad | --- lerna.json
@@ -1,5 +1,5 @@
{
- "version": "6.25.0",
+ "version": "6.24.0",
"npmClient": "yarn",
"changelogPreset": "angular",
"command": {
| chore: chaning packages version for first drop 25 publish | chore: chaning packages version for first drop 25 publish
|
d8d1533fe0d69f65497380d920a54efec6365869 | --- android/app/build.gradle
@@ -134,7 +134,7 @@ android {
applicationId "com.walmart.stores.allspark.beta"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 52
+ versionCode 53
versionName "1.0.4"
}
splits {
--- ios/AllSpark/Info.plist
@@ -34,7 +34,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>52</string>
+ <string>53</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>invmgmt</string>
--- ios/AllSparkTests/Info.plist
@@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>52</string>
+ <string>53</string>
</dict>
</plist>
| Incrementing build number | Incrementing build number
|
bef459105a4c2cbaeec07f6469fde663c158a4fd | --- .looper.yml
@@ -101,4 +101,9 @@ flows:
sonar:
- call: coverage
- - sonar("Sonar"): sonar-scanner -Dproject.settings=sonar-project.properties
+ - sonar("Sonar"): sonar-scanner -X -Dproject.settings=sonar-project.properties
+ -Dsonar.pullrequest.github.repository=allspark/allspark
+ -Dsonar.pullrequest.key=${GITHUB_PR_NUMBER}
+ -Dsonar.pullrequest.branch=${GITHUB_PR_SOURCE_BRANCH}
+ -Dsonar.pullrequest.base=${GITHUB_PR_TARGET_BRANCH}
+ -Dsonar.scm.revision=${GITHUB_PR_HEAD_SHA}
| fix: sonar scan for PRs | fix: sonar scan for PRs
|
0e716198bdba305de934834afeef6be8aad349d4 | --- package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@walmart/roster-mini-app",
- "version": "1.0.13",
+ "version": "1.0.14",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@walmart/roster-mini-app",
- "version": "1.0.13",
+ "version": "1.0.14",
"hasInstallScript": true,
"devDependencies": {
"@babel/core": "^7.20.0",
@@ -67,7 +67,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.11",
+ "@walmart/wmconnect-mini-app": "1.0.12",
"babel-jest": "^29.2.1",
"chance": "^1.1.11",
"eslint": "8.22.0",
@@ -11853,9 +11853,9 @@
}
},
"node_modules/@walmart/wmconnect-mini-app": {
- "version": "1.0.11",
- "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.11.tgz",
- "integrity": "sha512-cRZ9Q9dJ4MRUKYTq9a7W2/rrJ715ZE5McTXIvYZmJPbsabxjStsQa+vEPGEiyhzRV/Bbbj6pO4YHKOfh92BgJg==",
+ "version": "1.0.12",
+ "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.12.tgz",
+ "integrity": "sha512-0vaDvQB55hCZ0hRtAj1Dg4QOwAd+7H0WOeRmM8SlP/ZqEJ9DV6vy1mvKqtO0O+P/SpiQFwY/80EubJuKddNAfA==",
"dev": true,
"hasInstallScript": true
},
@@ -41071,9 +41071,9 @@
}
},
"@walmart/wmconnect-mini-app": {
- "version": "1.0.11",
- "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.11.tgz",
- "integrity": "sha512-cRZ9Q9dJ4MRUKYTq9a7W2/rrJ715ZE5McTXIvYZmJPbsabxjStsQa+vEPGEiyhzRV/Bbbj6pO4YHKOfh92BgJg==",
+ "version": "1.0.12",
+ "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.12.tgz",
+ "integrity": "sha512-0vaDvQB55hCZ0hRtAj1Dg4QOwAd+7H0WOeRmM8SlP/ZqEJ9DV6vy1mvKqtO0O+P/SpiQFwY/80EubJuKddNAfA==",
"dev": true
},
"@whatwg-node/events": {
--- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/roster-mini-app",
- "version": "1.0.13",
+ "version": "1.0.14",
"private": false,
"main": "dist/index.js",
"files": [
@@ -90,7 +90,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.11",
+ "@walmart/wmconnect-mini-app": "1.0.12",
"babel-jest": "^29.2.1",
"chance": "^1.1.11",
"eslint": "8.22.0",
--- src/services/config.ts
@@ -1,7 +1,7 @@
import type {EnvConfig} from '@walmart/core-services/Environment';
const miniAppPackage = require('../../package.json');
-export const HTTP_CLIENT_KEY = 'roster';
+export const HTTP_CLIENT_KEY = 'texting';
export const getGraphQLConfig = (envConfig: EnvConfig) => {
return {
| Update version | Update version
|
2b6655d997b5878abe1bddd1e0b762a2325d8849 | --- src/managerExperience/translations/index.ts
@@ -0,0 +1,18 @@
+import i18n from 'i18next';
+import {enUS} from './en-US';
+import {esMX} from './es-MX';
+
+export const MANAGER_EXPERIENCE_NAMESPACE = 'managerExperience';
+
+export const addLanguageResources = () => {
+ i18n.addResourceBundle('en-US', MANAGER_EXPERIENCE_NAMESPACE, enUS);
+ i18n.addResourceBundle('es-MX', MANAGER_EXPERIENCE_NAMESPACE, esMX);
+};
+
+export const initi18n = () => {
+ if (i18n.isInitialized) {
+ addLanguageResources();
+ } else {
+ i18n.on('initialized', addLanguageResources);
+ }
+};
| chore: added translations index file | chore: added translations index file
|
58e2ed5b7e9c17ae07a0a65d0d5a186dba8d23d9 | --- __tests__/translations/LanguageSettingsTest.tsx
@@ -1,5 +1,10 @@
import React from 'react';
-import {fireEvent, render, screen} from '@testing-library/react-native';
+import {
+ fireEvent,
+ render,
+ screen,
+ waitFor,
+} from '@testing-library/react-native';
import {useTranslation} from 'react-i18next';
import {localeActions} from '@walmart/redux-store';
import {LanguageSettings} from '../../src/translations/LanguageSettings';
@@ -15,7 +20,9 @@ test('LanguageSettings', async () => {
expect(EnglishRadioItem.props.checked).toEqual(true);
fireEvent.press(screen.getByTestId('es-MX'));
- expect(translation.i18n.changeLanguage).toHaveBeenCalledWith('es-MX');
+ await waitFor(() =>
+ expect(translation.i18n.changeLanguage).toHaveBeenCalledWith('es-MX'),
+ );
expect(localeActions.localeConfigSuccess).toHaveBeenCalledWith({
language: 'es-MX',
languageCode: 102,
--- src/settings/SettingsHome.tsx
@@ -101,7 +101,6 @@ export const SettingsHome = () => {
const {screenName, navParams, type, url} = setting;
if (type === 'navigate') {
- console.log('sva', screenName, navParams, type, url);
// @ts-ignore
navigation.navigate(screenName, navParams);
return;
--- src/translations/LanguageSettings.tsx
@@ -30,12 +30,12 @@ export const LanguageSettings = () => {
const onLanguageSelect = async (language: Language) => {
const {id, code} = language;
-
- telemetry.logEvent('settings', `${id}_selected`, {
+ const eventName = `${id}_selected`.replace('-', '_');
+ telemetry.logEvent('settings', eventName, {
current_language: i18n.language,
});
- i18n.changeLanguage(id);
+ await i18n.changeLanguage(id);
localeActions.localeConfigSuccess({
language: id,
languageCode: code,
| fix language change | fix language change
|
09b6c013892f806794d7bb6ea13dbca2120cb5e9 | --- core/__tests__/startup/DeeplinkFlowTest.ts
@@ -0,0 +1,84 @@
+import {Linking} from 'react-native';
+import {call} from 'redux-saga/effects';
+import {LoggerService} from '@walmart/allspark-foundation/Logger';
+import {handleDeepLink} from '../../src/startup/DeeplinkFlow';
+
+describe('DeeplinkFlow', () => {
+ const mockLogger = {error: jest.fn()};
+
+ beforeEach(() => {
+ jest.clearAllMocks();
+ LoggerService.getContainerInstance = jest.fn().mockReturnValue(mockLogger);
+
+ jest.spyOn(Linking, 'openURL').mockImplementation(() => Promise.resolve());
+ jest.spyOn(Linking, 'getInitialURL').mockImplementation(() => Promise.resolve(null));
+ });
+
+ afterEach(() => {
+ jest.restoreAllMocks();
+ });
+
+ describe('handleDeepLink', () => {
+ it('returns false when no initial URL', () => {
+ const iterator = handleDeepLink();
+
+ expect(iterator.next().value).toEqual(
+ call(Linking.getInitialURL)
+ );
+
+ const result = iterator.next(null);
+ expect(result.value).toBe(false);
+ expect(result.done).toBe(true);
+ });
+
+ it('returns false when initial URL does not include app scheme', () => {
+ const iterator = handleDeepLink();
+
+ expect(iterator.next().value).toEqual(
+ call(Linking.getInitialURL)
+ );
+
+ const result = iterator.next('https://walmart.com');
+ expect(result.value).toBe(false);
+ expect(result.done).toBe(true);
+ });
+
+ it('handles valid deeplink URL successfully', () => {
+ const validUrl = 'meatwmt://some/path';
+ const iterator = handleDeepLink();
+
+ expect(iterator.next().value).toEqual(
+ call(Linking.getInitialURL)
+ );
+
+ const result = iterator.next(validUrl);
+ expect(result.value).toBe(true);
+ expect(result.done).toBe(true);
+ expect(Linking.openURL).toHaveBeenCalledWith(validUrl);
+ });
+
+ it('handles error when opening URL fails', () => {
+ const validUrl = 'meatwmt://some/path';
+ const mockError = new Error('Failed to open URL');
+
+ jest.spyOn(Linking, 'getInitialURL').mockImplementation(() => Promise.resolve(validUrl));
+ jest.spyOn(Linking, 'openURL').mockImplementation(() => {
+ throw mockError;
+ });
+
+ const iterator = handleDeepLink();
+
+ expect(iterator.next().value).toEqual(
+ call(Linking.getInitialURL)
+ );
+
+ const result = iterator.next(validUrl);
+ expect(result.value).toBe(false);
+ expect(result.done).toBe(true);
+
+ expect(mockLogger.error).toHaveBeenCalledWith('Error opening deeplink URI', {
+ message: mockError.message,
+ });
+ });
+ });
+});
| added test coverage for deeplink flow | added test coverage for deeplink flow
|
776a19b80a07e5b8ec86407cf0dad4f365804bae | --- package.json
@@ -150,7 +150,7 @@
"@walmart/perf-pay-mini-app": "0.7.204",
"@walmart/persona-hub": "0.8.1",
"@walmart/price-changes-mini-app": "1.17.2",
- "@walmart/profile-feature-app": "2.157.2-UPV2MyWalmart.0",
+ "@walmart/profile-feature-app": "2.157.6-UPV2MyWalmart.0",
"@walmart/react-native-barcode-builder": "^1.0.1",
"@walmart/react-native-cookies": "1.0.1",
"@walmart/react-native-encrypted-storage": "~1.1.3",
--- yarn.lock
@@ -8883,7 +8883,7 @@ __metadata:
"@walmart/perf-pay-mini-app": "npm:0.7.204"
"@walmart/persona-hub": "npm:0.8.1"
"@walmart/price-changes-mini-app": "npm:1.17.2"
- "@walmart/profile-feature-app": "npm:2.157.2-UPV2MyWalmart.0"
+ "@walmart/profile-feature-app": "npm:2.157.6-UPV2MyWalmart.0"
"@walmart/react-native-barcode-builder": "npm:^1.0.1"
"@walmart/react-native-cookies": "npm:1.0.1"
"@walmart/react-native-encrypted-storage": "npm:~1.1.3"
@@ -9390,9 +9390,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/profile-feature-app@npm:2.157.2-UPV2MyWalmart.0":
- version: 2.157.2-UPV2MyWalmart.0
- resolution: "@walmart/profile-feature-app@npm:2.157.2-UPV2MyWalmart.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fprofile-feature-app%2F-%2F%40walmart%2Fprofile-feature-app-2.157.2-UPV2MyWalmart.0.tgz"
+"@walmart/profile-feature-app@npm:2.157.6-UPV2MyWalmart.0":
+ version: 2.157.6-UPV2MyWalmart.0
+ resolution: "@walmart/profile-feature-app@npm:2.157.6-UPV2MyWalmart.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fprofile-feature-app%2F-%2F%40walmart%2Fprofile-feature-app-2.157.6-UPV2MyWalmart.0.tgz"
peerDependencies:
"@apollo/client": "*"
"@livingdesign/tokens-next": "*"
@@ -9439,7 +9439,7 @@ __metadata:
peerDependenciesMeta:
react-router-dom:
optional: true
- checksum: 10c0/3de4097fdff3b4236ff867c37e49d4ba64c8db1a3a50e7cfe2a1559c444c66193bcf795744c9baa7dcdbcfa30e71d5c6ebeed27ab86010c2b4afb896ea34a1c6
+ checksum: 10c0/ea3bbbfd6db017ef26a19a3c0103d449ba0325412813b6221b29319e664675112242d4804a5b030d98c0a8e72b95e97c7795666fa47b167c4b841979c2f59bf5
languageName: node
linkType: hard
| fix(profile-feature-app): bump profile-feature-app with VQA fab ui fixes (#5382) | fix(profile-feature-app): bump profile-feature-app with VQA fab ui fixes (#5382)
|
2bffded68ff71e6d4dc61cbd06a9dac23b05d1d8 | --- ios/Podfile.lock
@@ -0,0 +1,3 @@
+
+
+
| adding back podfile.lock | adding back podfile.lock
|
85c2bb09b8a46e62c4865699928e5e0959cd7ae2 | --- src/screens/RosterDetailScreen/StoreRosterDetailScreen.tsx
@@ -28,6 +28,7 @@ import {useSelector} from 'react-redux';
import {
displayRoster,
displaySearchInput,
+ messageButtonEnabled,
showManagerTeamsHub,
teamLeadJobDescriptions,
} from '../../redux/selectors';
@@ -99,6 +100,7 @@ export const StoreRosterDetailScreen = ({route}: RosterDetailScreenProps) => {
const showRoster = useSelector(displayRoster);
const showSearchInput = useSelector(displaySearchInput);
const showTeamHub: boolean = useSelector(showManagerTeamsHub);
+ const isMessageButtonEnabled = useSelector(messageButtonEnabled);
const isManagerView = useUserCanSeeHub();
const isSalariedOrLead = showTeamHub && isManagerView;
const defaultTeamLabel = isSalariedOrLead
@@ -540,7 +542,7 @@ export const StoreRosterDetailScreen = ({route}: RosterDetailScreenProps) => {
}
ListFooterComponent={<View style={styles.footerSpacing} />}
/>
- {!dataLoading && (
+ {isMessageButtonEnabled && !dataLoading && (
<AllsparkSharedComponents.Component
id='wmConnect.GroupMessageButton'
props={{
--- src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen.tsx
@@ -29,6 +29,7 @@ import {useSelector} from 'react-redux';
import {
displayRoster,
displaySearchInput,
+ messageButtonEnabled,
showManagerTeamsHub,
teamLeadJobDescriptions,
} from '../../redux/selectors';
@@ -143,7 +144,7 @@ export const SupplyChainRosterDetailScreen = ({
const currentSiteId = useSelector(UserSelectors.getWorkingSite);
const parentSiteID = useRef(currentSiteId);
const userIsImpersonatedOnDev = useIsImpersonatedOnDev();
-
+ const isMessageButtonEnabled = useSelector(messageButtonEnabled);
useEffect(() => {
setTeamState({
teamLabel: defaultTeamLabel,
@@ -873,7 +874,7 @@ export const SupplyChainRosterDetailScreen = ({
}
ListFooterComponent={<View style={styles.footerSpacing} />}
/>
- {!dataLoading && (
+ {isMessageButtonEnabled && !dataLoading && (
<AllsparkSharedComponents.Component
id='wmConnect.GroupMessageButton'
props={{
| feat(ui): Update the roster message button condition for total store and team | feat(ui): Update the roster message button condition for total store and team
|
7543fc5581ebad067f6814a1fcb0e5cb7852ef05 | --- graphql.yml
@@ -103,24 +103,24 @@ applications:
# queryTemplate: "packages/me-at-walmart-athena-queries/src/updateManagerExperiencePreference.graphql"
# tags:
# - "v1"
- - name: "allspark-core-intl"
- applicationKey: "ALLSPARK_APP_INTL"
- description: "Core application for Me@Walmart International"
- environments:
- - name: "stg"
- persistedQueries:
- - name: "businessUnitByCountryAndNumber"
- hash: "dc5adc0197a2bfd29b0ecc4ec5a255f44f8e0700a8a6916a834ec745574ab54d"
- queryTemplate: "packages/me-at-walmart-athena-queries/src/businessUnitByCountryAndNumber.graphql"
- tags:
- - "v1"
- - name: "getAssociateById"
- hash: "0a06f624828f31fa5f8a13615385e1c3c4424732132e432655f4a45962a7fa22"
- queryTemplate: "packages/me-at-walmart-athena-queries/src/getAssociateById.graphql"
- tags:
- - "v1"
- - name: "getLoggedInUser"
- hash: "0beb54411dbf4e0c72d8d94982d755e0559023bc5e2c174e356b42f1e07b22fd"
- queryTemplate: "packages/me-at-walmart-athena-queries/src/getLoggedInUser.graphql"
- tags:
- - "v1"
+ - name: "allspark-core-intl"
+ applicationKey: "ALLSPARK_APP_INTL"
+ description: "Core application for Me@Walmart International"
+ environments:
+ - name: "stg"
+ persistedQueries:
+ - name: "businessUnitByCountryAndNumber"
+ hash: "dc5adc0197a2bfd29b0ecc4ec5a255f44f8e0700a8a6916a834ec745574ab54d"
+ queryTemplate: "packages/me-at-walmart-athena-queries/src/businessUnitByCountryAndNumber.graphql"
+ tags:
+ - "v1"
+ - name: "getAssociateById"
+ hash: "0a06f624828f31fa5f8a13615385e1c3c4424732132e432655f4a45962a7fa22"
+ queryTemplate: "packages/me-at-walmart-athena-queries/src/getAssociateById.graphql"
+ tags:
+ - "v1"
+ - name: "getLoggedInUser"
+ hash: "0beb54411dbf4e0c72d8d94982d755e0559023bc5e2c174e356b42f1e07b22fd"
+ queryTemplate: "packages/me-at-walmart-athena-queries/src/getLoggedInUser.graphql"
+ tags:
+ - "v1"
| Revert "fix: spacing" | Revert "fix: spacing"
This reverts commit c18fbdca783c1d5b737fb5cbee58c307b1443679.
|
c018a35fdf3b0f5daa4728f94ef2a5b6fdaf5a7b | --- assets/fonts/EverydaySansMono-Bold.otf
Binary files a/assets/fonts/EverydaySansMono-Bold.otf and b/assets/fonts/EverydaySansMono-Bold.otf differ
--- assets/fonts/EverydaySansMono-Regular.otf
Binary files a/assets/fonts/EverydaySansMono-Regular.otf and b/assets/fonts/EverydaySansMono-Regular.otf differ
--- assets/fonts/EverydaySansUI-Black.otf
Binary files a/assets/fonts/EverydaySansUI-Black.otf and b/assets/fonts/EverydaySansUI-Black.otf differ
--- assets/fonts/EverydaySansUI-Bold.otf
Binary files a/assets/fonts/EverydaySansUI-Bold.otf and b/assets/fonts/EverydaySansUI-Bold.otf differ
--- assets/fonts/EverydaySansUI-Medium.otf
Binary files a/assets/fonts/EverydaySansUI-Medium.otf and b/assets/fonts/EverydaySansUI-Medium.otf differ
--- assets/fonts/EverydaySansUI-Regular.otf
Binary files a/assets/fonts/EverydaySansUI-Regular.otf and b/assets/fonts/EverydaySansUI-Regular.otf differ
| chore: ALLSPARK-7548 update fonts for drop 35.1 (#5325) | chore: ALLSPARK-7548 update fonts for drop 35.1 (#5325)
Co-authored-by: Aroushi Sharma - a0s11tw <Aroushi.Sharma@walmart.com> |
2b71b57860642983ef3e73daf9ff2068bd7d0061 | --- packages/associate-exp-hub-mini-app/src/components/modals/smartModal/ModalContent.tsx
@@ -74,6 +74,7 @@ import {
EditSavedTeamsLoader,
WarningBanner,
EmptyTeamsList,
+ TeamItem,
} from '@walmart/allspark-foundation-hub';
import {ExtendedModalContentConfig} from '../../../types/modalTypes';
import {TelemetryHelpers} from '../../../services/telemetry/telemetry';
@@ -158,17 +159,26 @@ export const ModalContent: React.FC<ExtendedModalContentProps> = ({
!!modalConfig.savedTeamsConfig?.userPreferencesData?.length;
const isSavedTeamsLoading = modalConfig.savedTeamsConfig?.isLoading;
- const handleTeamItemPress = useCallback((item: any) => {
- // Log team item selection
- TelemetryHelpers.logUserInteraction({
- element_type: 'list_item',
- action: 'tap',
- value: `team_${item.teamId}`,
- element_id: `team_${item.teamId}_${item.teamName.replace(/\s+/g, '_').toLowerCase()}`
- });
+ const handleTeamItemPress = useCallback(
+ (item: any) => {
+ // Log team item selection
+ TelemetryHelpers.logUserInteraction({
+ element_type: 'list_item',
+ action: 'tap',
+ value: `team_${item.teamId}`,
+ element_id: `team_${item.teamId}_${item.teamName.replace(/\s+/g, '_').toLowerCase()}`,
+ });
+
+ modalConfig.allTeamsConfig?.onSectionItemPress?.(item);
+ },
+ [modalConfig.allTeamsConfig]
+ );
- modalConfig.allTeamsConfig?.onSectionItemPress?.(item);
- }, [modalConfig.allTeamsConfig]);
+ const isItemSelected = useCallback(
+ (item: TeamItem) =>
+ (modalConfig.allTeamsConfig?.sectionSelectedItem ?? '') === item.teamId,
+ [modalConfig.allTeamsConfig?.sectionSelectedItem]
+ );
const renderSectionItem = useCallback(
({item, index, section}: RenderSectionItemInfo) => {
@@ -184,24 +194,26 @@ export const ModalContent: React.FC<ExtendedModalContentProps> = ({
teamName={item.teamName}
teamImage={item?.teamImage ?? {blurHash: '', uri: ''}}
isPrimary={item.teamId === primaryTeam[0]?.teamId}
- isSelected={
- modalConfig.allTeamsConfig?.sectionSelectedItem === item.teamId
- }
+ isSelected={isItemSelected(item)}
onSelect={() => handleTeamItemPress(item)}
/>
);
return modalConfig.allTeamsConfig?.onSectionItemPress ? (
- <TouchableOpacity
- onPress={() => handleTeamItemPress(item)}
- >
+ <TouchableOpacity onPress={() => handleTeamItemPress(item)}>
{content}
</TouchableOpacity>
) : (
content
);
},
- [modalConfig.allTeamsConfig, translate, primaryTeam, handleTeamItemPress]
+ [
+ modalConfig.allTeamsConfig,
+ translate,
+ primaryTeam,
+ isItemSelected,
+ handleTeamItemPress,
+ ]
);
const renderEmptyAllTeamsState = useCallback(
@@ -290,7 +302,7 @@ export const ModalContent: React.FC<ExtendedModalContentProps> = ({
element_type: 'button',
action: 'tap',
value: 'edit_saved_teams',
- element_id: 'edit_saved_teams_button'
+ element_id: 'edit_saved_teams_button',
});
modalConfig.savedTeamsConfig?.handleEditSavedTeamsTextLink?.();
@@ -302,7 +314,7 @@ export const ModalContent: React.FC<ExtendedModalContentProps> = ({
element_type: 'button',
action: 'tap',
value: 'choose_teams_to_save',
- element_id: 'choose_teams_button'
+ element_id: 'choose_teams_button',
});
modalConfig.savedTeamsConfig?.handleEditSavedTeamsTextLink?.();
@@ -315,7 +327,7 @@ export const ModalContent: React.FC<ExtendedModalContentProps> = ({
element_type: 'modal',
action: 'tap',
value: 'team_selection_modal_open',
- element_id: `team_modal_${modalConfig.isEditModal ? 'edit' : 'view'}`
+ element_id: `team_modal_${modalConfig.isEditModal ? 'edit' : 'view'}`,
});
return () => {
@@ -324,7 +336,7 @@ export const ModalContent: React.FC<ExtendedModalContentProps> = ({
element_type: 'modal',
action: 'tap',
value: 'team_selection_modal_close',
- element_id: `team_modal_${modalConfig.isEditModal ? 'edit' : 'view'}`
+ element_id: `team_modal_${modalConfig.isEditModal ? 'edit' : 'view'}`,
});
};
}, [modalConfig.isEditModal]);
@@ -384,7 +396,7 @@ export const ModalContent: React.FC<ExtendedModalContentProps> = ({
element_type: 'search',
action: 'tap',
value: `search_${text.substring(0, 20).replace(/\s+/g, '_')}`,
- element_id: 'team_search_input'
+ element_id: 'team_search_input',
});
}
if (modalConfig.searchConfig?.handleChangeText) {
| feat(ui): initial selection of primary team | feat(ui): initial selection of primary team
|
0c48e39f7b80bb3c73a4df0ea786d4fd85dc04ba | --- package-lock.json
@@ -51,7 +51,7 @@
"@walmart/counts-component-miniapp": "0.1.8",
"@walmart/emergency-mini-app": "1.26.5",
"@walmart/exception-mini-app": "1.7.3",
- "@walmart/facilities-management-miniapp": "0.6.93",
+ "@walmart/facilities-management-miniapp": "0.7.3",
"@walmart/feedback-all-spark-miniapp": "0.9.52",
"@walmart/financial-wellbeing-feature-app": "1.16.3",
"@walmart/functional-components": "~4.0.3",
--- package.json
@@ -92,7 +92,7 @@
"@walmart/counts-component-miniapp": "0.1.8",
"@walmart/emergency-mini-app": "1.26.5",
"@walmart/exception-mini-app": "1.7.3",
- "@walmart/facilities-management-miniapp": "0.6.93",
+ "@walmart/facilities-management-miniapp": "0.7.3",
"@walmart/feedback-all-spark-miniapp": "0.9.52",
"@walmart/financial-wellbeing-feature-app": "1.16.3",
"@walmart/functional-components": "~4.0.3",
| updated fixit version | updated fixit version
|
6d1238506002c62f3f0eff07b7092cb5fb5128bf | --- packages/celebration-mini-app-graphql/package.json
@@ -36,7 +36,7 @@
"@types/react": "^18.2.45",
"@walmart/allspark-foundation": "7.12.0",
"@walmart/allspark-foundation-hub": "1.24.0",
- "@walmart/ax-components": "1.1.0",
+ "@walmart/ax-components": "1.2.3",
"@walmart/gtp-shared-components-3": "npm:@walmart/gtp-shared-components@3.0.0-beta.7",
"@walmart/me-at-walmart-common": "6.37.0",
"@walmart/my-walmart-hub": "1.4.0",
--- packages/celebration-mini-app/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/celebration-mini-app",
- "version": "1.34.0",
+ "version": "1.34.1",
"packageManager": "yarn@4.6.0",
"engines": {
"node": ">=18"
@@ -36,7 +36,7 @@
"@types/react": "^18.2.45",
"@walmart/allspark-foundation": "7.12.0",
"@walmart/allspark-foundation-hub": "1.24.0",
- "@walmart/ax-components": "1.1.0",
+ "@walmart/ax-components": "1.2.3",
"@walmart/gtp-shared-components-3": "npm:@walmart/gtp-shared-components@3.0.0-beta.7",
"@walmart/me-at-walmart-common": "6.37.0",
"@walmart/my-walmart-hub": "1.4.0",
--- yarn.lock
@@ -8293,9 +8293,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/ax-components@npm:1.1.0":
- version: 1.1.0
- resolution: "@walmart/ax-components@npm:1.1.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fax-components%2F-%2F%40walmart%2Fax-components-1.1.0.tgz"
+"@walmart/ax-components@npm:1.2.3":
+ version: 1.2.3
+ resolution: "@walmart/ax-components@npm:1.2.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fax-components%2F-%2F%40walmart%2Fax-components-1.2.3.tgz"
peerDependencies:
"@react-native-picker/picker": ~2.11.1
"@walmart/gtp-shared-components-3": "*"
@@ -8306,7 +8306,7 @@ __metadata:
react-native: 0.79.x
react-native-device-info: ~10.13.1
react-native-web: ^0.20.0
- checksum: 10c0/d8721116775652f51a2ba753e421e89d0a73cdc4aa7d8117fd62c9f9e1e8ebbbd2cef7672f7b2662be8e82b4f3780fd777b78b470b0059c24d3c9d604dab3fd3
+ checksum: 10c0/88e75dfc42e37d93b3a19f0d4b2028d36b09551740aad6916c65fb4abb62af9c1f122fc7b488fd2e53c6e28e842dba755d4b50ede9d84a3a2c9b582066629f67
languageName: node
linkType: hard
@@ -8466,7 +8466,7 @@ __metadata:
"@types/react": "npm:^18.2.45"
"@walmart/allspark-foundation": "npm:7.12.0"
"@walmart/allspark-foundation-hub": "npm:1.24.0"
- "@walmart/ax-components": "npm:1.1.0"
+ "@walmart/ax-components": "npm:1.2.3"
"@walmart/gtp-shared-components-3": "npm:@walmart/gtp-shared-components@3.0.0-beta.7"
"@walmart/me-at-walmart-common": "npm:6.37.0"
"@walmart/my-walmart-hub": "npm:1.4.0"
@@ -8520,7 +8520,7 @@ __metadata:
"@types/react": "npm:^18.2.45"
"@walmart/allspark-foundation": "npm:7.12.0"
"@walmart/allspark-foundation-hub": "npm:1.24.0"
- "@walmart/ax-components": "npm:1.1.0"
+ "@walmart/ax-components": "npm:1.2.3"
"@walmart/gtp-shared-components-3": "npm:@walmart/gtp-shared-components@3.0.0-beta.7"
"@walmart/me-at-walmart-common": "npm:6.37.0"
"@walmart/my-walmart-hub": "npm:1.4.0"
| feat(ui): update package version | feat(ui): update package version
|
2e97376495d47039244badb4590486b5630d6594 | --- package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@walmart/texting-mini-app",
- "version": "2.0.37",
+ "version": "2.0.38",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@walmart/texting-mini-app",
- "version": "2.0.37",
+ "version": "2.0.38",
"hasInstallScript": true,
"devDependencies": {
"@babel/core": "^7.8.4",
--- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/texting-mini-app",
- "version": "2.0.37",
+ "version": "2.0.38",
"private": false,
"main": "dist/index.js",
"files": [
--- package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@walmart/texting-mini-app",
- "version": "2.0.37",
+ "version": "2.0.38",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@walmart/texting-mini-app",
- "version": "2.0.37",
+ "version": "2.0.38",
"hasInstallScript": true,
"devDependencies": {
"@babel/core": "^7.8.4",
--- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/texting-mini-app",
- "version": "2.0.37",
+ "version": "2.0.38",
"private": false,
"main": "dist/index.js",
"files": [
| update version | update version
|
35e02ef279d73306c01eb2c9df20f6098ca07d82 | --- targets/US/package.json
@@ -145,7 +145,7 @@
"@walmart/schedule-mini-app": "0.118.2",
"@walmart/shelfavailability-mini-app": "1.5.37",
"@walmart/shop-gnfr-mini-app": "1.0.137",
- "@walmart/sidekick-mini-app": "4.84.12",
+ "@walmart/sidekick-mini-app": "4.84.13",
"@walmart/store-feature-orders": "1.27.1",
"@walmart/taskit-mini-app": "4.17.21",
"@walmart/time-clock-mini-app": "2.419.0",
--- yarn.lock
@@ -7052,7 +7052,7 @@ __metadata:
"@walmart/schedule-mini-app": "npm:0.118.2"
"@walmart/shelfavailability-mini-app": "npm:1.5.37"
"@walmart/shop-gnfr-mini-app": "npm:1.0.137"
- "@walmart/sidekick-mini-app": "npm:4.84.12"
+ "@walmart/sidekick-mini-app": "npm:4.84.13"
"@walmart/store-feature-orders": "npm:1.27.1"
"@walmart/taskit-mini-app": "npm:4.17.21"
"@walmart/time-clock-mini-app": "npm:2.419.0"
@@ -7939,9 +7939,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/sidekick-mini-app@npm:4.84.12":
- version: 4.84.12
- resolution: "@walmart/sidekick-mini-app@npm:4.84.12"
+"@walmart/sidekick-mini-app@npm:4.84.13":
+ version: 4.84.13
+ resolution: "@walmart/sidekick-mini-app@npm:4.84.13"
peerDependencies:
"@apollo/client": "*"
"@react-navigation/native": ^6.0.0
@@ -7954,7 +7954,7 @@ __metadata:
expo-linear-gradient: ~12.3.0
react: ^18.2.0
react-native: ^0.73.7
- checksum: 10c0/382348cff9f1697482d6af44c9de7149e9b73dcfd7d0ab7dd040954d4c97500559759e48e0c3e29399853573821999b2dd179ac1725df9d0a93dcafb34670552
+ checksum: 10c0/36ca70c682de97eef3fbb66abccf722a374a851018c86b5f390e7a0cae21b6e5889cbf8815802953edf8f3990e840d8bd807070c6de8c3e68e02711a6b55f53a
languageName: node
linkType: hard
| chore: bump sidekick@4.84.13 | chore: bump sidekick@4.84.13
|
c259fc7c6c1ab21f0d7a5bb454b560853c07f3a3 | --- package-lock.json
@@ -5333,9 +5333,9 @@
}
},
"@walmart/react-native-encrypted-storage": {
- "version": "1.0.2",
- "resolved": "https://npme.walmart.com/@walmart/react-native-encrypted-storage/-/react-native-encrypted-storage-1.0.2.tgz",
- "integrity": "sha512-rRkdidoEzXcFsM2xznGa/yvE0J1ULadQwFon7lzmvcswmZL0gxZ0Kcfr8Hqjk60NDvoS8aPSt4CxYuX6xBayAw=="
+ "version": "1.1.0",
+ "resolved": "https://npme.walmart.com/@walmart/react-native-encrypted-storage/-/react-native-encrypted-storage-1.1.0.tgz",
+ "integrity": "sha512-vssLucRgLr1rodadutk3OSF1x3UOT98JLT78F5DEBXCvfAJzs2a8WJurn+W8KmHQZolJVUuyX/tOytTRV9xdOw=="
},
"@walmart/react-native-env": {
"version": "0.2.0",
--- package.json
@@ -101,7 +101,7 @@
"@walmart/price-changes-mini-app": "^1.4.6",
"@walmart/profile-feature-app": "0.0.45",
"@walmart/push-to-talk-mini-app": "1.8.4",
- "@walmart/react-native-encrypted-storage": "1.0.2",
+ "@walmart/react-native-encrypted-storage": "1.1.0",
"@walmart/react-native-env": "^0.2.0",
"@walmart/react-native-logger": "^1.29.0",
"@walmart/react-native-scanner-3.0": "0.1.2",
| encrypted storage bump | encrypted storage bump
|
5f13b5e48910d64a4c9408c0b5dec5466791a516 | --- package-lock.json
@@ -67,7 +67,7 @@
"@walmart/mod-flex-mini-app": "1.10.4",
"@walmart/moment-walmart": "1.0.4",
"@walmart/onewalmart-miniapp": "1.0.16",
- "@walmart/pay-stub-miniapp": "0.10.12",
+ "@walmart/pay-stub-miniapp": "0.10.13",
"@walmart/payrollsolution_miniapp": "0.131.12",
"@walmart/price-changes-mini-app": "1.9.7",
"@walmart/profile-feature-app": "0.287.1",
@@ -8797,9 +8797,9 @@
}
},
"node_modules/@walmart/pay-stub-miniapp": {
- "version": "0.10.12",
- "resolved": "https://npme.walmart.com/@walmart/pay-stub-miniapp/-/pay-stub-miniapp-0.10.12.tgz",
- "integrity": "sha512-tM22WF9vOgVeDl8ithH6+1uRGizPS/kJUQBrj2iitZqWJvTNvpAO7xGHphWFWetpTK0eKQGgDACjLQPiko+avg==",
+ "version": "0.10.13",
+ "resolved": "https://npme.walmart.com/@walmart/pay-stub-miniapp/-/pay-stub-miniapp-0.10.13.tgz",
+ "integrity": "sha512-KZKF3C7rCRjiDwaNB5wnFuItLhDOI/J756yosgxDCTSBWZAq7TE/2qXsPZz9Cp5QwC8xSpvvFA1z6Mkub+65hg==",
"hasInstallScript": true,
"dependencies": {
"crypto-js": "^3.3.0"
@@ -33741,9 +33741,9 @@
}
},
"@walmart/pay-stub-miniapp": {
- "version": "0.10.12",
- "resolved": "https://npme.walmart.com/@walmart/pay-stub-miniapp/-/pay-stub-miniapp-0.10.12.tgz",
- "integrity": "sha512-tM22WF9vOgVeDl8ithH6+1uRGizPS/kJUQBrj2iitZqWJvTNvpAO7xGHphWFWetpTK0eKQGgDACjLQPiko+avg==",
+ "version": "0.10.13",
+ "resolved": "https://npme.walmart.com/@walmart/pay-stub-miniapp/-/pay-stub-miniapp-0.10.13.tgz",
+ "integrity": "sha512-KZKF3C7rCRjiDwaNB5wnFuItLhDOI/J756yosgxDCTSBWZAq7TE/2qXsPZz9Cp5QwC8xSpvvFA1z6Mkub+65hg==",
"requires": {
"crypto-js": "^3.3.0"
}
--- package.json
@@ -108,7 +108,7 @@
"@walmart/mod-flex-mini-app": "1.10.4",
"@walmart/moment-walmart": "1.0.4",
"@walmart/onewalmart-miniapp": "1.0.16",
- "@walmart/pay-stub-miniapp": "0.10.12",
+ "@walmart/pay-stub-miniapp": "0.10.13",
"@walmart/payrollsolution_miniapp": "0.131.12",
"@walmart/price-changes-mini-app": "1.9.7",
"@walmart/profile-feature-app": "0.287.1",
| bump version | bump version
|
7c83e563503f984ca6e96c993450af94e588a31a | --- __tests__/components/RosterWidget.test.tsx
@@ -1,24 +1,12 @@
jest.useFakeTimers();
-import React from 'react';
import * as hooks from '../../src/hooks';
-import {renderWithProviders} from '../harness';
-import {RosterWidget} from '../../src/components/RosterWidget/RosterWidget';
-import {TeamHubWidgetProps} from '@walmart/allspark-foundation-hub';
import {GetDailyRosterQueryResult} from '../../src/queries/getDailyRoster';
import {mockGetDailyRosterQuery} from '../harness/athenaQueries/getDailyRoster';
import {mockGetTeamsByStoreQuery} from '../harness/athenaQueries/getTeamsByStore';
import {mockSupplyChainTeamsByBusinessUnitQuery} from '../harness/athenaQueries/supplyChainTeamsByBusinessUnit';
import {GetTeamByIdQueryResult} from '../../src/queries/getTeamById';
import {SupplyChainTeamsByBusinessUnitQueryResult} from '../../src/queries/supplyChainTeamsByBusinessUnit';
-import {finishPendingRequests} from '../harness/utils';
import {mockGetSupplyChainShiftsQuery} from '../harness/athenaQueries/getSupplyChainShifts';
-import {GetSupplyChainShiftsQueryResult} from '../../src/queries/getSupplyChainShifts';
-
-const props: TeamHubWidgetProps = {
- selectedTeamIds: ['1'],
- refresh: 'refresh',
- widgetStyle: {},
-};
jest.mock('../../src/hooks', () => ({
...jest.requireActual('../../src/hooks'),
@@ -62,20 +50,18 @@ describe('RosterWidget', () => {
refetch: jest.fn(() => Promise.resolve({data: {}})),
} as unknown as SupplyChainTeamsByBusinessUnitQueryResult);
- jest.spyOn(hooks, 'useSupplyChainShifts').mockReturnValue({
- ...mockGetSupplyChainShiftsQuery.result,
- loading: false,
- error: undefined,
- refetch: jest.fn(),
- } as unknown as GetSupplyChainShiftsQueryResult);
+ jest
+ .spyOn(hooks, 'useSupplyChainShifts')
+ // @ts-ignore
+ .mockReturnValue({
+ ...mockGetSupplyChainShiftsQuery.result,
+ loading: false,
+ error: undefined,
+ refetch: jest.fn(),
+ });
});
afterAll(() => {
jest.restoreAllMocks();
});
- it.skip('renders correctly with given props', async () => {
- const {toJSON} = renderWithProviders(<RosterWidget {...props} />);
- await finishPendingRequests();
- expect(toJSON()).toMatchSnapshot();
- });
});
| fix(bug): fix linting warnings | fix(bug): fix linting warnings
|
bb42110644a5695a9ce5373459f771b627b87fa6 | --- android/app/build.gradle
@@ -158,8 +158,8 @@ android {
applicationId "com.walmart.stores.allspark.beta"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 909
- versionName "1.11.1"
+ versionCode 908
+ versionName "1.11.0"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
// We configure the CMake build only if you decide to opt-in for the New Architecture.
@@ -358,6 +358,7 @@ dependencies {
} else {
implementation jscFlavor
}
+
implementation "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava"
}
--- android/build.gradle
@@ -40,7 +40,7 @@ buildscript {
classpath("de.undercouch:gradle-download-task:5.0.1")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
- classpath 'com.google.gms:google-services:4.3.15'
+ classpath 'com.google.gms:google-services:4.3.3'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.0'
classpath 'com.google.firebase:perf-plugin:1.4.1'
classpath 'com.walmart.ssmp:android-signing:1.0.9'
--- env.dev.js
@@ -40,7 +40,7 @@ export default {
},
// Use shadow gateway url and persistedQueries: true to test unregistered queries
athena: {
- // url: 'https://athena-gateway.sdev.us.walmart.net', // shadow gateway
+ // url: 'https://athena-gateway.sdev.us.walmart.net', // shadow gateway
url: 'https://developer.api.us.stg.walmart.com/api-proxy/service/ATHENA/GATEWAY/v1',
headers: {
'WM_SVC.NAME': 'ATHENA-GATEWAY',
--- ios/AllSpark.xcodeproj/project.pbxproj
@@ -540,7 +540,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D994751F557438D6B85DBCC2 /* Pods-AllSpark.debug.xcconfig */;
buildSettings = {
- ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Teflon";
+ ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Dev";
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = AllSpark/AllSpark.entitlements;
@@ -586,7 +586,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 99D7C873A014A98046591001 /* Pods-AllSpark.release.xcconfig */;
buildSettings = {
- ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Teflon";
+ ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Dev";
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = AllSpark/AllSpark.entitlements;
--- ios/AllSpark/Info.plist
@@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.11.1</string>
+ <string>1.11.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@@ -134,7 +134,7 @@
<string>remote-notification</string>
</array>
<key>UILaunchStoryboardName</key>
- <string>LaunchScreen-Teflon</string>
+ <string>LaunchScreen-Dev</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
--- package-lock.json
@@ -57,7 +57,7 @@
"@walmart/inbox-mini-app": "0.83.3",
"@walmart/iteminfo-mini-app": "7.2.2",
"@walmart/manager-approvals-miniapp": "0.2.2",
- "@walmart/me-field-mini-app": "12.0.19",
+ "@walmart/me-field-mini-app": "12.0.20",
"@walmart/metrics-mini-app": "0.11.5",
"@walmart/mod-flex-mini-app": "1.8.6",
"@walmart/moment-walmart": "1.0.4",
@@ -5453,9 +5453,9 @@
}
},
"node_modules/@walmart/me-field-mini-app": {
- "version": "12.0.19",
- "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-12.0.19.tgz",
- "integrity": "sha512-0M27Y/VR3Uroh/wH1i6VwKoMpZR3xPzpWA7d1AouG9l3ShX38UgdkbXOovDfQM6MzNac4zLlyE7gru32ikCoCg==",
+ "version": "12.0.20",
+ "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-12.0.20.tgz",
+ "integrity": "sha512-2UoWw4eidfAl1brZ+WJUN/yZq12ZKtmHjIbTaMkowofe67j7zHQd5ECxiShcg3Bnb91pNL04FvVXg5n2zw5ueQ==",
"hasInstallScript": true,
"peerDependencies": {
"@atmt/feedback-component-native": "^8.0.0",
@@ -25348,9 +25348,9 @@
}
},
"@walmart/me-field-mini-app": {
- "version": "12.0.19",
- "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-12.0.19.tgz",
- "integrity": "sha512-0M27Y/VR3Uroh/wH1i6VwKoMpZR3xPzpWA7d1AouG9l3ShX38UgdkbXOovDfQM6MzNac4zLlyE7gru32ikCoCg=="
+ "version": "12.0.20",
+ "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-12.0.20.tgz",
+ "integrity": "sha512-2UoWw4eidfAl1brZ+WJUN/yZq12ZKtmHjIbTaMkowofe67j7zHQd5ECxiShcg3Bnb91pNL04FvVXg5n2zw5ueQ=="
},
"@walmart/metrics-mini-app": {
"version": "0.11.5",
--- package.json
@@ -99,7 +99,7 @@
"@walmart/inbox-mini-app": "0.83.3",
"@walmart/iteminfo-mini-app": "7.2.2",
"@walmart/manager-approvals-miniapp": "0.2.2",
- "@walmart/me-field-mini-app": "12.0.19",
+ "@walmart/me-field-mini-app": "12.0.20",
"@walmart/metrics-mini-app": "0.11.5",
"@walmart/mod-flex-mini-app": "1.8.6",
"@walmart/moment-walmart": "1.0.4",
--- patches/@apollo+client+3.7.9.patch
@@ -1,13 +0,0 @@
-diff --git a/node_modules/@apollo/client/react/types/types.d.ts b/node_modules/@apollo/client/react/types/types.d.ts
-index f7f8a02..06c8fc4 100644
---- a/node_modules/@apollo/client/react/types/types.d.ts
-+++ b/node_modules/@apollo/client/react/types/types.d.ts
-@@ -38,7 +38,7 @@ export interface QueryDataOptions<TData = any, TVariables extends OperationVaria
- export interface QueryHookOptions<TData = any, TVariables extends OperationVariables = OperationVariables> extends QueryFunctionOptions<TData, TVariables> {
- query?: DocumentNode | TypedDocumentNode<TData, TVariables>;
- }
--export interface LazyQueryHookOptions<TData = any, TVariables extends OperationVariables = OperationVariables> extends Omit<QueryHookOptions<TData, TVariables>, 'skip'> {
-+export interface LazyQueryHookOptions<TData = any, TVariables extends OperationVariables = OperationVariables> extends QueryHookOptions<TData, TVariables> {
- }
- export interface QueryLazyOptions<TVariables> {
- variables?: TVariables;
| ♻️ Bump Learning mini app and remove core config files | ♻️ Bump Learning mini app and remove core config files
|
3c8663d37ff28903630e0dbb3c0c85d3e2fbba00 | --- package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@walmart/texting-mini-app",
- "version": "2.0.27",
+ "version": "2.0.29",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@walmart/texting-mini-app",
- "version": "2.0.27",
+ "version": "2.0.29",
"hasInstallScript": true,
"devDependencies": {
"@babel/core": "^7.8.4",
@@ -95,6 +95,7 @@
"react-native-fs": "^2.18.0",
"react-native-gesture-handler": "^2.9.0",
"react-native-get-random-values": "^1.8.0",
+ "react-native-haptic-feedback": "^1.14.0",
"react-native-hyperlink": "0.0.22",
"react-native-image-picker": "4.10.0",
"react-native-modal": "^13.0.1",
@@ -24739,6 +24740,16 @@
"dev": true,
"license": "MIT"
},
+ "node_modules/react-native-haptic-feedback": {
+ "version": "1.14.0",
+ "resolved": "https://npme.walmart.com/react-native-haptic-feedback/-/react-native-haptic-feedback-1.14.0.tgz",
+ "integrity": "sha512-dSXZ6gAzl+W/L7BPjOpnT0bx0cgQiSr0sB3DjyDJbGIdVr4ISaktZC6gC9xYFTv2kMq0+KtbKi+dpd0WtxYZMw==",
+ "dev": true,
+ "license": "MIT",
+ "peerDependencies": {
+ "react-native": ">=0.60.0"
+ }
+ },
"node_modules/react-native-hyperlink": {
"version": "0.0.22",
"resolved": "https://npme.walmart.com/react-native-hyperlink/-/react-native-hyperlink-0.0.22.tgz",
@@ -46936,6 +46947,12 @@
"integrity": "sha512-oOanj84fJEXUg9FoEAQomA8ISG+DVIrTZ3qF7m69VQUJyOGYyDZmPqKcjvRku4KXlEH6hWO9i4ACLzNBh8gC0A==",
"dev": true
},
+ "react-native-haptic-feedback": {
+ "version": "1.14.0",
+ "resolved": "https://npme.walmart.com/react-native-haptic-feedback/-/react-native-haptic-feedback-1.14.0.tgz",
+ "integrity": "sha512-dSXZ6gAzl+W/L7BPjOpnT0bx0cgQiSr0sB3DjyDJbGIdVr4ISaktZC6gC9xYFTv2kMq0+KtbKi+dpd0WtxYZMw==",
+ "dev": true
+ },
"react-native-hyperlink": {
"version": "0.0.22",
"resolved": "https://npme.walmart.com/react-native-hyperlink/-/react-native-hyperlink-0.0.22.tgz",
--- package.json
@@ -55,6 +55,7 @@
"@react-native-firebase/perf": "^17.4.2",
"@react-native-picker/picker": "^2.4.8",
"@react-navigation/material-top-tabs": "^6.1.0",
+ "react-native-haptic-feedback": "^1.14.0",
"@react-navigation/native": "^6.0.0",
"@react-navigation/stack": "^6.1.0",
"@reduxjs/toolkit": "^1.9.5",
--- src/channels/pushToTalkProvider.tsx
@@ -14,6 +14,7 @@ import firestore from '@react-native-firebase/firestore';
import {playReceivingPTTMessage} from '../redux/audioPlayThunk';
import {useDispatch} from 'react-redux';
import {ThunkDispatch} from 'redux-thunk';
+import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
/*
* Caution: This provider goes to allspark-core container
@@ -83,6 +84,10 @@ export const PushToTalkProvider = (props: PropsWithChildren<{}>) => {
useEffect(() => {
if (liveVoiceUri) {
+ ReactNativeHapticFeedback.trigger('impactLight', {
+ enableVibrateFallback: true,
+ ignoreAndroidSystemSettings: false,
+ });
dispatch(playReceivingPTTMessage(liveVoiceUri));
}
}, [liveVoiceUri]);
--- package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@walmart/texting-mini-app",
- "version": "2.0.27",
+ "version": "2.0.29",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@walmart/texting-mini-app",
- "version": "2.0.27",
+ "version": "2.0.29",
"hasInstallScript": true,
"devDependencies": {
"@babel/core": "^7.8.4",
@@ -95,6 +95,7 @@
"react-native-fs": "^2.18.0",
"react-native-gesture-handler": "^2.9.0",
"react-native-get-random-values": "^1.8.0",
+ "react-native-haptic-feedback": "^1.14.0",
"react-native-hyperlink": "0.0.22",
"react-native-image-picker": "4.10.0",
"react-native-modal": "^13.0.1",
@@ -24739,6 +24740,16 @@
"dev": true,
"license": "MIT"
},
+ "node_modules/react-native-haptic-feedback": {
+ "version": "1.14.0",
+ "resolved": "https://npme.walmart.com/react-native-haptic-feedback/-/react-native-haptic-feedback-1.14.0.tgz",
+ "integrity": "sha512-dSXZ6gAzl+W/L7BPjOpnT0bx0cgQiSr0sB3DjyDJbGIdVr4ISaktZC6gC9xYFTv2kMq0+KtbKi+dpd0WtxYZMw==",
+ "dev": true,
+ "license": "MIT",
+ "peerDependencies": {
+ "react-native": ">=0.60.0"
+ }
+ },
"node_modules/react-native-hyperlink": {
"version": "0.0.22",
"resolved": "https://npme.walmart.com/react-native-hyperlink/-/react-native-hyperlink-0.0.22.tgz",
@@ -46936,6 +46947,12 @@
"integrity": "sha512-oOanj84fJEXUg9FoEAQomA8ISG+DVIrTZ3qF7m69VQUJyOGYyDZmPqKcjvRku4KXlEH6hWO9i4ACLzNBh8gC0A==",
"dev": true
},
+ "react-native-haptic-feedback": {
+ "version": "1.14.0",
+ "resolved": "https://npme.walmart.com/react-native-haptic-feedback/-/react-native-haptic-feedback-1.14.0.tgz",
+ "integrity": "sha512-dSXZ6gAzl+W/L7BPjOpnT0bx0cgQiSr0sB3DjyDJbGIdVr4ISaktZC6gC9xYFTv2kMq0+KtbKi+dpd0WtxYZMw==",
+ "dev": true
+ },
"react-native-hyperlink": {
"version": "0.0.22",
"resolved": "https://npme.walmart.com/react-native-hyperlink/-/react-native-hyperlink-0.0.22.tgz",
--- package.json
@@ -55,6 +55,7 @@
"@react-native-firebase/perf": "^17.4.2",
"@react-native-picker/picker": "^2.4.8",
"@react-navigation/material-top-tabs": "^6.1.0",
+ "react-native-haptic-feedback": "^1.14.0",
"@react-navigation/native": "^6.0.0",
"@react-navigation/stack": "^6.1.0",
"@reduxjs/toolkit": "^1.9.5",
--- src/channels/pushToTalkProvider.tsx
@@ -14,6 +14,7 @@ import firestore from '@react-native-firebase/firestore';
import {playReceivingPTTMessage} from '../redux/audioPlayThunk';
import {useDispatch} from 'react-redux';
import {ThunkDispatch} from 'redux-thunk';
+import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
/*
* Caution: This provider goes to allspark-core container
@@ -83,6 +84,10 @@ export const PushToTalkProvider = (props: PropsWithChildren<{}>) => {
useEffect(() => {
if (liveVoiceUri) {
+ ReactNativeHapticFeedback.trigger('impactLight', {
+ enableVibrateFallback: true,
+ ignoreAndroidSystemSettings: false,
+ });
dispatch(playReceivingPTTMessage(liveVoiceUri));
}
}, [liveVoiceUri]);
| Adding haptic feedback upon PTT receiving | Adding haptic feedback upon PTT receiving
|
70a6ac132b2a81998f1e3221ccf1bfcdc384b25b | --- package-lock.json
@@ -45,7 +45,7 @@
"@walmart/allspark-utils": "6.0.16",
"@walmart/amp-mini-app": "1.1.80",
"@walmart/ask-sam-chat-components": "^0.2.7",
- "@walmart/ask-sam-mini-app": "1.20.5",
+ "@walmart/ask-sam-mini-app": "1.21.2",
"@walmart/attendance-mini-app": "3.24.0",
"@walmart/avp-feature-app": "0.2.10",
"@walmart/avp-shared-library": "0.2.12",
@@ -71,7 +71,7 @@
"@walmart/impersonation-mini-app": "1.20.8",
"@walmart/ims-print-services-ui": "2.10.3",
"@walmart/inbox-mini-app": "0.92.10",
- "@walmart/iteminfo-mini-app": "7.10.13",
+ "@walmart/iteminfo-mini-app": "7.12.1",
"@walmart/learning-mini-app": "20.0.3",
"@walmart/manager-approvals-miniapp": "0.2.4",
"@walmart/me-at-walmart-athena-queries": "6.0.16",
@@ -10876,13 +10876,13 @@
}
},
"node_modules/@walmart/ask-sam-mini-app": {
- "version": "1.20.5",
- "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.20.5.tgz",
- "integrity": "sha512-oy05yZ+X0SafEE9SAXIadTEyXZJbz3O/wfFGLHF3f0xi1X6BH50wpnWHOTtF3rGVGZ41ZNRwa7QqdQ1mtqa0oA==",
+ "version": "1.21.2",
+ "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.21.2.tgz",
+ "integrity": "sha512-I8L9NrHg6l7RwlQ4Ms7eB5tUNpYCt2DhDnw7ns3Lvo2sXydBCdnystKksHyhcT0ybXjjhsgC/Kybd3UDoTciLQ==",
"license": "NONE",
"dependencies": {
"apisauce": "^1.1.2",
- "axios-cache-adapter": "^2.7.3",
+ "axios-cache-adapter": ">=2.7.3",
"numeral": "^2.0.6",
"reduxsauce": "^1.2.0"
},
@@ -10911,7 +10911,6 @@
"react-native-blob-util": ">=0.16",
"react-native-device-info": ">=10.3",
"react-native-error-boundary": ">=1.1.6",
- "react-native-fast-image": ">=8.6",
"react-native-modal": ">=13",
"react-native-pdf": ">=6.6.2",
"react-native-popup-menu": ">=0.15.9",
@@ -11684,9 +11683,9 @@
}
},
"node_modules/@walmart/iteminfo-mini-app": {
- "version": "7.10.13",
- "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.10.13.tgz",
- "integrity": "sha512-Q/Zkz6VU3DiJsgWSyQExJ6dEUdoeWx08q55QY/XHJkU3BgOgL16Pi3+EhaywHgrn2WMRHCe+EzZ4X1j47cCWhA==",
+ "version": "7.12.1",
+ "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.12.1.tgz",
+ "integrity": "sha512-4BSDOk1xEKV+DObHdbhXYGECmFG/Nc75S9dFtGlN85veYR4PkTi4vkMl9YAH/AobggNl54TpYzxdH4448OBpgA==",
"hasInstallScript": true,
"peerDependencies": {
"@react-navigation/drawer": ">=6.3.0",
--- package.json
@@ -86,7 +86,7 @@
"@walmart/allspark-utils": "6.0.16",
"@walmart/amp-mini-app": "1.1.80",
"@walmart/ask-sam-chat-components": "^0.2.7",
- "@walmart/ask-sam-mini-app": "1.20.5",
+ "@walmart/ask-sam-mini-app": "1.21.2",
"@walmart/attendance-mini-app": "3.24.0",
"@walmart/avp-feature-app": "0.2.10",
"@walmart/avp-shared-library": "0.2.12",
@@ -112,7 +112,7 @@
"@walmart/impersonation-mini-app": "1.20.8",
"@walmart/ims-print-services-ui": "2.10.3",
"@walmart/inbox-mini-app": "0.92.10",
- "@walmart/iteminfo-mini-app": "7.10.13",
+ "@walmart/iteminfo-mini-app": "7.12.1",
"@walmart/learning-mini-app": "20.0.3",
"@walmart/manager-approvals-miniapp": "0.2.4",
"@walmart/me-at-walmart-athena-queries": "6.0.16",
@@ -352,7 +352,7 @@
"@walmart/allspark-utils": "6.0.16",
"@walmart/amp-mini-app": "1.1.80",
"@walmart/ask-sam-chat-components": "^0.2.7",
- "@walmart/ask-sam-mini-app": "1.20.5",
+ "@walmart/ask-sam-mini-app": "1.21.2",
"@walmart/attendance-mini-app": "3.24.0",
"@walmart/avp-feature-app": "0.2.10",
"@walmart/avp-shared-library": "0.2.12",
@@ -377,7 +377,7 @@
"@walmart/impersonation-mini-app": "1.20.8",
"@walmart/ims-print-services-ui": "2.10.3",
"@walmart/inbox-mini-app": "0.92.10",
- "@walmart/iteminfo-mini-app": "7.10.13",
+ "@walmart/iteminfo-mini-app": "7.12.1",
"@walmart/learning-mini-app": "20.0.3",
"@walmart/manager-approvals-miniapp": "0.2.4",
"@walmart/me-at-walmart-athena-queries": "6.0.16",
| bump up iteminfo and saksam for drop 21 | bump up iteminfo and saksam for drop 21
|
26023efe06d4a2307a1e8e851f5bcfb79d85f505 | --- src/channels/hooks.ts
@@ -1,10 +1,12 @@
/* eslint-disable react-hooks/exhaustive-deps */
-import {useContext, useMemo} from 'react';
+import {useContext, useEffect, useMemo, useState} from 'react';
import {ChannelsContext} from './context';
import {LocalFirebaseChannel, LastMessage} from './types';
import firestore from '@react-native-firebase/firestore';
import {useSelector} from 'react-redux';
import {getUnreadChannelsCount} from '../redux/selectors';
+import {useLocalStorage} from '@walmart/core-services/LocalStorage';
+import {LOCAL_STORAGE_KEY_PREFIX} from '../constants';
export const useChannelContext = () => useContext(ChannelsContext);
@@ -64,8 +66,28 @@ export const useUnread = () => {
};
export const useChannelUnreadCount = () => {
+ const localStorage = useLocalStorage();
+ const localStorageKey = LOCAL_STORAGE_KEY_PREFIX + 'unread-channels-count';
const unreadChannelsCount = useSelector(getUnreadChannelsCount);
- return unreadChannelsCount > 0 ? unreadChannelsCount : null;
+ const [unreadChannelsCountState, setUnreadChannelsCountState] = useState<
+ number | null
+ >(null);
+
+ //Get from asyncStorage on mount
+ useEffect(() => {
+ localStorage.get(localStorageKey);
+ setUnreadChannelsCountState(unreadChannelsCount);
+ }, []);
+
+ //Set async storage if value changes
+ useEffect(() => {
+ localStorage.set(localStorageKey, String(unreadChannelsCount));
+ setUnreadChannelsCountState(unreadChannelsCount);
+ }, [unreadChannelsCount]);
+
+ return unreadChannelsCountState && unreadChannelsCountState > 0
+ ? unreadChannelsCountState
+ : null;
};
export const useChannelDetails = (id: string) => {
--- src/codeOfConduct/provider.tsx
@@ -14,8 +14,9 @@ import {useIsFocused} from '@react-navigation/native';
import {useTranslation} from 'react-i18next';
import {TEXTING_I18N_NAMESPACE} from '../translations';
import {useLocalStorage} from '@walmart/core-services/LocalStorage';
+import {LOCAL_STORAGE_KEY_PREFIX} from '../constants';
-const LOCAL_STORAGE_KEY = 'texting-coc-accepted';
+const LOCAL_STORAGE_KEY = LOCAL_STORAGE_KEY_PREFIX + 'coc-accepted';
export const CodeOfConductProvider = (props: PropsWithChildren<{}>) => {
const {children} = props;
--- src/constants.ts
@@ -1,4 +1,3 @@
-//TODO: Move this to more standard place
export const RNFBConfigAndroid = '75AC25EB-432A-47D1-855A-84728D2AB60C';
export const RNFBConfigiOS = '75AC25EB-432A-47D1-855A-84728D2AB60C';
export const ROOT_CONTAINER_SCREEN_NAME = 'myTeam';
@@ -6,6 +5,7 @@ export const APP_CONTAINER_SCREEN_NAME = 'myTeam.root';
export const MESSAGES_SCREEN_NAME = 'myTeam.messages';
export const WHOLE_STORE = 'WHOLESTORE';
export const PUSHTOTALK_SCREEN_NAME = 'myTeam.pushToTalk';
+export const LOCAL_STORAGE_KEY_PREFIX = 'texting-';
// eslint-disable-next-line no-shadow
export enum messageTypes {
AUDIO = 'AUDIO',
@@ -17,3 +17,5 @@ export enum payTypes {
SALARIED = 'S',
HOURLY = 'H',
}
+
+
--- src/channels/hooks.ts
@@ -1,10 +1,12 @@
/* eslint-disable react-hooks/exhaustive-deps */
-import {useContext, useMemo} from 'react';
+import {useContext, useEffect, useMemo, useState} from 'react';
import {ChannelsContext} from './context';
import {LocalFirebaseChannel, LastMessage} from './types';
import firestore from '@react-native-firebase/firestore';
import {useSelector} from 'react-redux';
import {getUnreadChannelsCount} from '../redux/selectors';
+import {useLocalStorage} from '@walmart/core-services/LocalStorage';
+import {LOCAL_STORAGE_KEY_PREFIX} from '../constants';
export const useChannelContext = () => useContext(ChannelsContext);
@@ -64,8 +66,28 @@ export const useUnread = () => {
};
export const useChannelUnreadCount = () => {
+ const localStorage = useLocalStorage();
+ const localStorageKey = LOCAL_STORAGE_KEY_PREFIX + 'unread-channels-count';
const unreadChannelsCount = useSelector(getUnreadChannelsCount);
- return unreadChannelsCount > 0 ? unreadChannelsCount : null;
+ const [unreadChannelsCountState, setUnreadChannelsCountState] = useState<
+ number | null
+ >(null);
+
+ //Get from asyncStorage on mount
+ useEffect(() => {
+ localStorage.get(localStorageKey);
+ setUnreadChannelsCountState(unreadChannelsCount);
+ }, []);
+
+ //Set async storage if value changes
+ useEffect(() => {
+ localStorage.set(localStorageKey, String(unreadChannelsCount));
+ setUnreadChannelsCountState(unreadChannelsCount);
+ }, [unreadChannelsCount]);
+
+ return unreadChannelsCountState && unreadChannelsCountState > 0
+ ? unreadChannelsCountState
+ : null;
};
export const useChannelDetails = (id: string) => {
--- src/codeOfConduct/provider.tsx
@@ -14,8 +14,9 @@ import {useIsFocused} from '@react-navigation/native';
import {useTranslation} from 'react-i18next';
import {TEXTING_I18N_NAMESPACE} from '../translations';
import {useLocalStorage} from '@walmart/core-services/LocalStorage';
+import {LOCAL_STORAGE_KEY_PREFIX} from '../constants';
-const LOCAL_STORAGE_KEY = 'texting-coc-accepted';
+const LOCAL_STORAGE_KEY = LOCAL_STORAGE_KEY_PREFIX + 'coc-accepted';
export const CodeOfConductProvider = (props: PropsWithChildren<{}>) => {
const {children} = props;
--- src/constants.ts
@@ -1,4 +1,3 @@
-//TODO: Move this to more standard place
export const RNFBConfigAndroid = '75AC25EB-432A-47D1-855A-84728D2AB60C';
export const RNFBConfigiOS = '75AC25EB-432A-47D1-855A-84728D2AB60C';
export const ROOT_CONTAINER_SCREEN_NAME = 'myTeam';
@@ -6,6 +5,7 @@ export const APP_CONTAINER_SCREEN_NAME = 'myTeam.root';
export const MESSAGES_SCREEN_NAME = 'myTeam.messages';
export const WHOLE_STORE = 'WHOLESTORE';
export const PUSHTOTALK_SCREEN_NAME = 'myTeam.pushToTalk';
+export const LOCAL_STORAGE_KEY_PREFIX = 'texting-';
// eslint-disable-next-line no-shadow
export enum messageTypes {
AUDIO = 'AUDIO',
@@ -17,3 +17,5 @@ export enum payTypes {
SALARIED = 'S',
HOURLY = 'H',
}
+
+
| adding local storage behavior | adding local storage behavior
|
fb33c1a742cfeb5f606357ebd67fa5a6945b2aae | --- packages/allspark-foundation-hub/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.25.31](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.25.30...@walmart/allspark-foundation-hub@1.25.31) (2026-01-05)
+
+**Note:** Version bump only for package @walmart/allspark-foundation-hub
+
## [1.25.30](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.25.29...@walmart/allspark-foundation-hub@1.25.30) (2026-01-02)
**Note:** Version bump only for package @walmart/allspark-foundation-hub
--- packages/allspark-foundation-hub/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/allspark-foundation-hub",
- "version": "1.25.30",
+ "version": "1.25.31",
"description": "",
"main": "lib/index.js",
"types": "lib/index.d.ts",
--- packages/allspark-foundation/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.
+## [7.17.11](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.17.10...@walmart/allspark-foundation@7.17.11) (2026-01-05)
+
+### Bug Fixes
+
+- **location:** fix location nits ([#559](https://gecgithub01.walmart.com/allspark/allspark/issues/559)) ([407e0ee](https://gecgithub01.walmart.com/allspark/allspark/commit/407e0eee92d0d6e7057b4ae33df95c6287e86033))
+
## [7.17.10](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.17.9...@walmart/allspark-foundation@7.17.10) (2026-01-02)
### Bug Fixes
--- packages/allspark-foundation/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/allspark-foundation",
- "version": "7.17.10",
+ "version": "7.17.11",
"description": "",
"main": "Core/index.js",
"types": "Core/index.d.ts",
--- packages/me-at-walmart-location/CHANGELOG.md
@@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.2.21](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-location@1.2.20...@walmart/me-at-walmart-location@1.2.21) (2026-01-05)
+
+### Bug Fixes
+
+- **location:** fix location nits ([#559](https://gecgithub01.walmart.com/allspark/allspark/issues/559)) ([407e0ee](https://gecgithub01.walmart.com/allspark/allspark/commit/407e0eee92d0d6e7057b4ae33df95c6287e86033))
+
## [1.2.20](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-location@1.2.19...@walmart/me-at-walmart-location@1.2.20) (2025-12-02)
**Note:** Version bump only for package @walmart/me-at-walmart-location
--- packages/me-at-walmart-location/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/me-at-walmart-location",
- "version": "1.2.20",
+ "version": "1.2.21",
"description": "Geofencing, location tracking and location services for me@ apps",
"author": "m0n09mr <maksym.novakh@walmart.com>",
"main": "./lib/cjs/index.js",
--- packages/my-walmart-hub/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.11.2](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/my-walmart-hub@1.11.1...@walmart/my-walmart-hub@1.11.2) (2026-01-05)
+
+**Note:** Version bump only for package @walmart/my-walmart-hub
+
## [1.11.1](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/my-walmart-hub@1.11.0...@walmart/my-walmart-hub@1.11.1) (2026-01-02)
**Note:** Version bump only for package @walmart/my-walmart-hub
--- packages/my-walmart-hub/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/my-walmart-hub",
- "version": "1.11.1",
+ "version": "1.11.2",
"description": "My Walmart Hub - A comprehensive hub framework for building dynamic widget-based interfaces",
"main": "lib/index.js",
"types": "lib/index.d.ts",
| chore(version): updating package version | chore(version): updating package version
- @walmart/allspark-foundation@7.17.11
- @walmart/allspark-foundation-hub@1.25.31
- @walmart/me-at-walmart-location@1.2.21
- @walmart/my-walmart-hub@1.11.2
|
9fe710fbb764bd08756e0ac1a41219d33da859e8 | --- targets/US/package.json
@@ -148,7 +148,7 @@
"@walmart/store-feature-orders": "1.26.12",
"@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.3.0#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.3.0-a2dd632c59.patch",
"@walmart/time-clock-mini-app": "2.400.0",
- "@walmart/topstock-mini-app": "1.16.21-299-f82ab41",
+ "@walmart/topstock-mini-app": "1.16.22",
"@walmart/ui-components": "patch:@walmart/ui-components@patch%3A@walmart/ui-components@npm%253A1.16.1%23~/.yarn/patches/@walmart-ui-components-npm-1.16.1-c240fb0151.patch%3A%3Aversion=1.16.1&hash=79c828#~/.yarn/patches/@walmart-ui-components-patch-cd5ae6f92c.patch",
"@walmart/welcomeme-mini-app": "0.95.1",
"@walmart/wfm-ui": "1.6.0",
--- yarn.lock
@@ -7126,7 +7126,7 @@ __metadata:
"@walmart/store-feature-orders": "npm:1.26.12"
"@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.3.0#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.3.0-a2dd632c59.patch"
"@walmart/time-clock-mini-app": "npm:2.400.0"
- "@walmart/topstock-mini-app": "npm:1.16.21-299-f82ab41"
+ "@walmart/topstock-mini-app": "npm:1.16.22"
"@walmart/ui-components": "patch:@walmart/ui-components@patch%3A@walmart/ui-components@npm%253A1.16.1%23~/.yarn/patches/@walmart-ui-components-npm-1.16.1-c240fb0151.patch%3A%3Aversion=1.16.1&hash=79c828#~/.yarn/patches/@walmart-ui-components-patch-cd5ae6f92c.patch"
"@walmart/welcomeme-mini-app": "npm:0.95.1"
"@walmart/wfm-ui": "npm:1.6.0"
@@ -8113,9 +8113,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/topstock-mini-app@npm:1.16.21-299-f82ab41":
- version: 1.16.21-299-f82ab41
- resolution: "@walmart/topstock-mini-app@npm:1.16.21-299-f82ab41"
+"@walmart/topstock-mini-app@npm:1.16.22":
+ version: 1.16.22
+ resolution: "@walmart/topstock-mini-app@npm:1.16.22"
peerDependencies:
"@react-native-firebase/app": ^15.1.1
"@react-native-firebase/crashlytics": ^15.1.1
@@ -8132,7 +8132,7 @@ __metadata:
react-native-haptic-feedback: ^1.13.0
react-native-vector-icons: ">=6.6.0"
react-redux: ">=7.2.0"
- checksum: 10c0/684d68f8a972758c5fc94e0290cf6ad3ea772395679676b1f34ac196cd89f6d249d124087549c4ffc3aab7420b481bd153408321f8b9a9afdfaa41f1d06e1d8f
+ checksum: 10c0/98052bbaed113a1acfeb6a7ec58885c582891bad3014c0dcf7e9563e3b6bb6d062079462c0a24042fd3ac9a31bda750170bcbbe1810d215585c480cfcd8a71e4
languageName: node
linkType: hard
| fix(): updated topstock version | fix(): updated topstock version
|
7e0762650e5f1b421545bf654d04a8a6d8dad8bc | --- src/navigation/index.tsx
@@ -6,15 +6,12 @@ import {GestureHandlerRootView} from 'react-native-gesture-handler';
import {Header} from '@walmart/ui-components';
import {RenderGuard} from '@walmart/allspark-utils';
-import {UserSelectors} from '@walmart/allspark-foundation/User';
-import {AllsparkNavigationClient} from '@walmart/allspark-foundation/Navigation';
import {
useMinimizedCallView,
useCallEventListeners,
} from '@walmart/calling-mini-app';
import {UpdateVersionModal} from '../updates/UpdateVersionModal';
-import {LINK_CONFIG} from '../core/DeeplinkConfig';
import {
WelcomeScreen,
LocationScreen,
@@ -57,7 +54,6 @@ const RootStack = createStackNavigator<RootStackMap>();
const styles = StyleSheet.create({gestureRootView: {flex: 1}});
export const RootStackNavigation = () => {
- const userId = useSelector(UserSelectors.getUserId);
const isAppAccessible = useSelector(getIsAppAccessible);
const {MinimizedCallView} = useMinimizedCallView();
@@ -70,15 +66,6 @@ export const RootStackNavigation = () => {
SplashScreen.hide();
}, []);
- /**
- * Set up deep linking once user is set in state
- */
- useEffect(() => {
- if (userId) {
- AllsparkNavigationClient.setLinkingOptions(LINK_CONFIG);
- }
- }, [userId]);
-
return (
<GestureHandlerRootView style={styles.gestureRootView}>
<RenderGuard preRenderHook={useRootStartup}>
| fix: remove old set linking options | fix: remove old set linking options
|
d32552b597b835f704639e64480173b468cccb00 | --- .github/pull_request_template.md
@@ -7,6 +7,7 @@ PR/Template Process for Allspark-core: [Link](https://confluence.walmart.com/pag
## Links to JIRA tickets:
<br/>
+
| Yes | No |
| -------- |
| [ ] | [ ] |
| twicking changes | twicking changes
|
36b4c8a7d16edec6f349d5366d698991fc6b89a5 | --- src/changeStore/ChangeStoreModal.tsx
@@ -69,7 +69,8 @@ export const ChangeStoreModal = (
const opacity = useRef(new Animated.Value(1)).current;
const workingSite = useSelector(SiteSelectors.getWorkingSiteSiteId);
- const countryCode = useSelector(SiteSelectors.getWorkingSiteCountryCode);
+ // We are setting this as a default, as LocationMDM supports searching for both PR and US stores if we pass US as countryCode and not the other way around
+ const countryCode = 'US';
const changeStoreModalEnabled = useSelector(getChangeStoreModalEnabled);
const networkSiteMismatch = useSelector(getNetworkSiteMismatch);
| fix: default countryCode to US | fix: default countryCode to US
|
d854117781fac53b91d6ebf33baa365168bc1386 | --- package-lock.json
@@ -25273,7 +25273,9 @@
}
},
"@walmart/mod-flex-mini-app": {
- "version": "1.9.4"
+ "version": "1.9.4",
+ "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.9.4.tgz",
+ "integrity": "sha512-Z2Mh6hXBXAdZl6suTlO7lCa9GODtImMITZfhqNwYeDVT1fesqbW80s4zgUI2OyqDarPs9/wizWBooeyk+Anb2A=="
},
"@walmart/moment-walmart": {
"version": "1.0.4"
--- src/home/components/CopilotCard/index.tsx
@@ -0,0 +1,45 @@
+// import React, {FC} from 'react';
+// import {useSelector} from 'react-redux';
+// import {View} from 'react-native';
+// import {useTranslation} from 'react-i18next';
+
+// import {Headline} from '@walmart/gtp-shared-components';
+// import {
+// ClockStatusSelectors,
+// SiteSelectors,
+// UserSelectors,
+// } from '@walmart/redux-store';
+// import {TaskCards} from '@walmart/taskit-mini-app';
+
+// import {useHomeAppConfig} from '../../../hooks/useAppConfig';
+// import {TaskClockStatusTeamCard} from './TaskClockStatusTeamCard';
+// import {TaskClockStatusTeamCard2} from './TaskClockStatusTeamCard2';
+
+// import {TaskClockStatusStoreCard} from './TaskClockStatusStoreCard';
+// import styles from './styles';
+// import {TaskCardProps} from './types';
+// import { AllQuickActionCards } from '@walmart/copilot-mini-app';
+
+// export const TMS_VERSION_2 = '2';
+
+// export const CopilotCard: FC = (props) => {
+// const {style} = props;
+// const {t} = useTranslation(['home']);
+
+// const isClockedIn = useSelector(ClockStatusSelectors.getIsClockedIn);
+// const teamIds = useSelector(UserSelectors.getUserTeamIds);
+// const isStore = useSelector(SiteSelectors.isSiteWmtStore);
+// const context = isStore ? 'store' : 'site';
+
+// const showTaskClockStatus = useHomeAppConfig('showTaskClockStatus', true);
+// const tmsVersion = useHomeAppConfig('tmsVersion', TMS_VERSION_2);
+
+// return isClockedIn ? (
+// <View style={[styles.container, style]} testID='copilotCards'>
+// <Headline style={styles.titleText}>
+// {t('teams.teamTaskTitle', {context})}
+// </Headline>
+// <AllQuickActionCards />
+// </View>
+// ) : null;
+// };
--- src/home/components/TaskCard/index.tsx
@@ -18,6 +18,7 @@ import {TaskClockStatusTeamCard2} from './TaskClockStatusTeamCard2';
import {TaskClockStatusStoreCard} from './TaskClockStatusStoreCard';
import styles from './styles';
import {TaskCardProps} from './types';
+import {getBottomNavConfigMap} from '../../../navConfig/NavConfigRedux';
export const TMS_VERSION_2 = '2';
@@ -29,12 +30,19 @@ export const TaskCard: FC<TaskCardProps> = (props) => {
const teamIds = useSelector(UserSelectors.getUserTeamIds);
const isStore = useSelector(SiteSelectors.isSiteWmtStore);
const context = isStore ? 'store' : 'site';
-
+ const configMap = useSelector(getBottomNavConfigMap);
+ const {copilot} = configMap;
const showTaskClockStatus = useHomeAppConfig('showTaskClockStatus', true);
const tmsVersion = useHomeAppConfig('tmsVersion', TMS_VERSION_2);
- return isClockedIn ? (
- <View style={[styles.container, style]} testID='taskCard'>
+ return !isClockedIn ? (
+ <View
+ style={[
+ styles.container,
+ style,
+ {display: copilot.enabled ? 'none' : 'flex'},
+ ]}
+ testID='taskCard'>
<Headline style={styles.titleText}>
{t('teams.teamTaskTitle', {context})}
</Headline>
--- src/home/containers/HomeScreen/defaultLayout.ts
@@ -44,6 +44,11 @@ export default [
component: 'TaskCard',
},
],
+ [
+ {
+ component: 'CopilotCard',
+ },
+ ],
[
{
component: 'MetricsHomeScreen',
--- src/home/containers/HomeScreen/index.tsx
@@ -24,7 +24,7 @@ import {CelebrationCard} from '../../components/CelebrationCard';
import {TaskCard} from '../../components/TaskCard';
import defaultLayout from './defaultLayout';
import styles from './styles';
-import {AllQuickActionCards} from '@walmart/copilot-mini-app';
+import {AllQuickActionCards, QuickActionCard} from '@walmart/copilot-mini-app';
// Constants
const DefaultLinearColors = [colors.white, colors.gray[5], colors.gray[5]];
@@ -56,7 +56,7 @@ export const HomeScreen: React.FC<Props> = () => {
const [parentSiteId, setParentSiteId] = useState(currentSiteId);
const scrollPosition = useRef(new Animated.Value(0)).current;
const lastUpdatedTimeout = useRef<any>();
- const layout = useHomeAppConfig('layout', defaultLayout);
+ const layout = defaultLayout; // useHomeAppConfig('layout', defaultLayout);
const hideTimestamp = () => setShowTimestamp(false);
// --- Refresh --- //
@@ -141,9 +141,9 @@ export const HomeScreen: React.FC<Props> = () => {
style={styles.cardStyle}
/>
),
+ CopilotCard: () => <QuickActionCard />,
TaskCard: () => (
- <AllQuickActionCards />
- //<TaskCard {...getRefreshProps('taskCard')} style={styles.cardStyle} />
+ <TaskCard {...getRefreshProps('taskCard')} style={styles.cardStyle} />
),
}),
[getRefreshProps],
--- src/navigation/AssociateHallwayNav/Tabs/index.tsx
@@ -28,7 +28,7 @@ import {
taskTabBarBadgeStyle,
} from '@walmart/taskit-mini-app';
import {Hooks} from '@walmart/push-to-talk-mini-app';
-import CopilotMiniApp from '@walmart/copilot-mini-app';
+import CopilotMiniApp, {useWorkBadgeCount} from '@walmart/copilot-mini-app';
import InboxMiniApp, {getInboxBadgeCount} from '@walmart/inbox-mini-app';
import {colors} from '@walmart/gtp-shared-components';
@@ -175,7 +175,7 @@ export const MainTabsNav = () => {
const [pttTextBadgeCount] = Hooks.useTextBadgesCount(0);
const badgesCount = useSelector(getInboxBadgeCount);
const taskTabBadge = getTaskTabBarBadge();
-
+ const {total} = useWorkBadgeCount();
const configMap = useSelector(getBottomNavConfigMap);
const {home, me, askSam, myTeam, taskit, copilot} = configMap;
const pttBadgeCount = pttVoiceBadgeCount + pttTextBadgeCount;
@@ -251,6 +251,8 @@ export const MainTabsNav = () => {
icon: 'inactive-task',
iconSelected: 'task-active',
}),
+ tabBarBadge: total || undefined,
+ tabBarBadgeStyle: taskTabBarBadgeStyle,
}}
/>
) : (
| feat: add badges | feat: add badges
|
968a0166b329ce9ddf29da528f5c018eefc282cf | --- src/index.tsx
@@ -1,7 +1,7 @@
import React, {Dispatch, useMemo, useReducer} from 'react';
import {useSelector} from 'react-redux';
import {firebase} from '@react-native-firebase/app-check';
-import {SiteSelectors, addSagas} from '@walmart/redux-store';
+import {SiteSelectors} from '@walmart/redux-store';
import {useEnvironment} from '@walmart/core-services/Environment';
import {LoggerCloneProvider} from '@walmart/core-services/Logger';
--- src/index.tsx
@@ -1,7 +1,7 @@
import React, {Dispatch, useMemo, useReducer} from 'react';
import {useSelector} from 'react-redux';
import {firebase} from '@react-native-firebase/app-check';
-import {SiteSelectors, addSagas} from '@walmart/redux-store';
+import {SiteSelectors} from '@walmart/redux-store';
import {useEnvironment} from '@walmart/core-services/Environment';
import {LoggerCloneProvider} from '@walmart/core-services/Logger';
| removing dead import | removing dead import
|
883ac34a774da0d8e225a4db7bb9bf32f70a5430 | --- packages/allspark-foundation/__tests__/FeatureRunner/components/LanguageButton.test.tsx
@@ -29,7 +29,7 @@ describe('ChangeLanguageButton', () => {
fireEvent.press(button);
expect(AllsparkNavigationClient.openModal).toHaveBeenCalledWith(
- 'container.changeLanguage'
+ 'Allspark.ChangeLanguage'
);
});
--- packages/allspark-foundation/__tests__/Translation/modals/ChangeLanguageModal.test.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { ChangeLanguageModalComponent } from '../../../src/Translation/modals/ChangeLanguageModal';
+import { ChangeLanguageModal } from '../../../src/Translation/modals/ChangeLanguageModal';
import { AllsparkTranslationClient } from '../../../src/Translation';
import { render, fireEvent } from '../../utils';
@@ -10,11 +10,6 @@ jest.mock('../../../src/Translation', () => ({
getLocaleConfig: jest.fn(),
getSupportedLanguages: jest.fn().mockImplementation(() => ['English (EN)']),
},
-
- useAllsparkModal: jest.fn().mockImplementation(() => ({
- openModal: jest.fn(),
- closeModal: jest.fn(),
- })),
useAllsparkTranslation: jest.fn(() => ({
i18n: {
language: 'en-US',
@@ -22,19 +17,26 @@ jest.mock('../../../src/Translation', () => ({
})),
}));
-describe('ChangeLanguageModalComponent', () => {
+jest.mock('../../../src/Navigation', () => ({
+ useAllsparkModal: jest.fn().mockImplementation(() => ({
+ openModal: jest.fn(),
+ closeModal: jest.fn(),
+ })),
+}));
+
+describe('ChangeLanguageModal', () => {
afterEach(() => {
jest.clearAllMocks();
});
test('should render snapshot', async () => {
- const { toJSON } = render(<ChangeLanguageModalComponent />);
+ const { toJSON } = render(<ChangeLanguageModal />);
expect(toJSON()).toMatchSnapshot();
});
test('should be interactive', async () => {
- const { getByTestId } = render(<ChangeLanguageModalComponent />);
+ const { getByTestId } = render(<ChangeLanguageModal />);
const radio = getByTestId('English (EN)');
fireEvent.press(radio);
--- packages/allspark-foundation/__tests__/Translation/modals/__snapshots__/ChangeLanguageModal.test.tsx.snap
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`ChangeLanguageModalComponent should render snapshot 1`] = `
+exports[`ChangeLanguageModal should render snapshot 1`] = `
<BottomSheet
isOpen={true}
onClose={[Function]}
--- packages/allspark-foundation/src/Container/AllsparkContainer.tsx
@@ -293,7 +293,9 @@ export class AllsparkContainer<
AllsparkNotificationClient.configure(notification);
}
- const navigation = await AllsparkEnvironment.resolveDerivedValue(this.config.navigation);
+ const navigation = await AllsparkEnvironment.resolveDerivedValue(
+ this.config.navigation
+ );
if (navigation) {
AllsparkNavigationClient.configure(navigation);
}
--- packages/allspark-foundation/src/Navigation/modals/index.ts
@@ -1,5 +1,5 @@
-import { ChangeLanguageModal } from "../../Translation/modals/ChangeLanguageModal";
-import { AllsparkPromptModal, PromptModalProps } from "./PromptModal";
+import { ChangeLanguageModal } from '../../Translation/modals/ChangeLanguageModal';
+import { AllsparkPromptModal, PromptModalProps } from './PromptModal';
export type BaseModalParams = {
'Allspark.Prompt': PromptModalProps;
@@ -14,10 +14,10 @@ export type BaseModalParams = {
* so you can opt in/out? May be too opinionated in UX.
*/
export const DefaultModalStack = {
- 'Allspark.Prompt': { modal: AllsparkPromptModal },
- 'Allspark.ChangeLanguage': {
- modal: ChangeLanguageModal,
- position: 'bottom',
- backdropOpacity: 0,
- }
-}
\ No newline at end of file
+ 'Allspark.Prompt': { modal: AllsparkPromptModal },
+ 'Allspark.ChangeLanguage': {
+ modal: ChangeLanguageModal,
+ position: 'bottom',
+ backdropOpacity: 0,
+ },
+};
--- packages/allspark-foundation/src/Navigation/types.ts
@@ -25,7 +25,6 @@ import { RequiredBy } from '@walmart/allspark-utils';
export type { ModalStackConfig } from 'react-native-modalfy';
-
export type QueuedNavigation<P extends ParamListBase> = {
name: keyof P;
params?: P[keyof P];
--- packages/allspark-foundation/src/Translation/modals/ChangeLanguageModal.tsx
@@ -69,4 +69,3 @@ export const ChangeLanguageModal = () => {
</BottomSheet>
);
};
-
| chore: fix tests | chore: fix tests
|
7015e8effc6da35b42d225aea5820decc136a93f | --- __tests__/__mocks__/@walmart/redux-store.js
@@ -37,6 +37,11 @@ module.exports = {
appConfigInitSuccess: jest.fn(),
appConfigInitError: jest.fn(),
},
+ deviceInfoActions: {
+ deviceInfoProgress: jest.fn(),
+ deviceInfoSuccess: jest.fn(),
+ deviceInfoError: jest.fn(),
+ },
SIGN_IN_SUCCESS: 'SIGN_IN_SUCCESS',
SIGN_OUT_SUCCESS: 'SIGN_OUT_SUCCESS',
START_IMPERSONATION: 'START_IMPERSONATION',
--- __tests__/core/deviceInfoInitTest.ts
@@ -1,21 +1,7 @@
-import {getStore} from '@walmart/redux-store';
-import {
- deviceInfoProgress,
- deviceInfoSuccess,
- deviceInfoError,
-} from '@walmart/redux-store/lib/commonjs/actions/deviceInfo.actions';
+import {deviceInfoActions} from '@walmart/redux-store';
import {DeviceConfig} from '@walmart/config-components';
import {initDeviceInfo} from '../../src/core/deviceInfoInit';
-// jest.mock(
-// '@walmart/redux-store/lib/commonjs/actions/deviceInfo.actions',
-// () => ({
-// deviceInfoProgress: jest.fn(),
-// deviceInfoSuccess: jest.fn(),
-// deviceInfoError: jest.fn(),
-// }),
-// );
-
describe('deviceInfoInit', () => {
beforeEach(() => {
jest.clearAllMocks();
@@ -27,20 +13,18 @@ describe('deviceInfoInit', () => {
await initDeviceInfo();
- expect(getStore().dispatch).toHaveBeenCalledWith(deviceInfoProgress());
- expect(getStore().dispatch).toHaveBeenCalledWith(
- deviceInfoSuccess({
- brand: DeviceConfig.brand,
- deviceId: DeviceConfig.deviceId,
- os: 'ios',
- type: deviceType,
- appName: DeviceConfig.appName,
- buildNumber: DeviceConfig.buildNumber,
- bundleId: DeviceConfig.bundleId,
- isEmulator: true,
- isTablet: DeviceConfig.isTablet,
- }),
- );
+ expect(deviceInfoActions.deviceInfoProgress).toHaveBeenCalled();
+ expect(deviceInfoActions.deviceInfoSuccess).toHaveBeenCalledWith({
+ brand: DeviceConfig.brand,
+ deviceId: DeviceConfig.deviceId,
+ os: 'ios',
+ type: deviceType,
+ appName: DeviceConfig.appName,
+ buildNumber: DeviceConfig.buildNumber,
+ bundleId: DeviceConfig.bundleId,
+ isEmulator: true,
+ isTablet: DeviceConfig.isTablet,
+ });
});
it('handles failure', async () => {
@@ -49,7 +33,7 @@ describe('deviceInfoInit', () => {
await initDeviceInfo();
- expect(getStore().dispatch).toHaveBeenCalledWith(deviceInfoProgress());
- expect(getStore().dispatch).toHaveBeenCalledWith(deviceInfoError(error));
+ expect(deviceInfoActions.deviceInfoProgress).toHaveBeenCalledWith();
+ expect(deviceInfoActions.deviceInfoError).toHaveBeenCalledWith(error);
});
});
--- __tests__/redux/SharedSelectorsTest.ts
@@ -1,3 +1,4 @@
+import {DeviceInfoState, DeviceTypes} from '@walmart/redux-store';
import {
getAppConfigState,
getAppConfigLoaded,
@@ -20,6 +21,7 @@ import {
getUpdateChecksState,
getAppConfigError,
getSiteConfigError,
+ getDeviceType,
} from '../../src/redux/SharedSelectors';
const appConfigState = {
@@ -294,4 +296,27 @@ describe('shared selelctors', () => {
expect(state).toEqual(updateChecksState);
});
});
+
+ describe('getDeviceType', () => {
+ it('returns expected value', () => {
+ const deviceType: DeviceTypes = DeviceTypes.BYOD;
+ const deviceInfoState: DeviceInfoState = {
+ data: {
+ brand: 'stuff',
+ deviceId: '123123123',
+ message: '',
+ name: 'deviceName',
+ os: 'ios',
+ type: deviceType,
+ },
+ error: false,
+ fetchingDeviceInfo: false,
+ fetchingDeviceInfoError: false,
+ loaded: true,
+ };
+
+ const result = getDeviceType({deviceInfo: deviceInfoState});
+ expect(result).toEqual(deviceType);
+ });
+ });
});
--- package-lock.json
@@ -3084,9 +3084,9 @@
}
},
"@walmart/config-components": {
- "version": "1.0.25",
- "resolved": "https://npme.walmart.com/@walmart/config-components/-/config-components-1.0.25.tgz",
- "integrity": "sha512-0uGJ8uVMjofuO3Jh+oAK9r1fO8qemRSRFCNnN4OjLWwK7s/6WIYXuIr48n77f4rV1Ipo3F2YIbSzR3HQfBa07A=="
+ "version": "1.0.26",
+ "resolved": "https://npme.walmart.com/@walmart/config-components/-/config-components-1.0.26.tgz",
+ "integrity": "sha512-PaVy13mQ/ehDdi+UiSK0Z4DG1iuL4PId2bYlccy1uHj5FEGW/S2tPrPJL/xIEjv3P6XLQnw/C05OObgyq9RY7A=="
},
"@walmart/counts-component-miniapp": {
"version": "0.0.9",
@@ -3210,9 +3210,9 @@
"integrity": "sha512-xXCe5sJeytOO9HAKLaTiQQMzomfUS2wUP6ICLYv9BGtdJUDmoKNT7aFYeRDGPgvPvkc1A8oFrqJIrOshjLnxSg=="
},
"@walmart/redux-store": {
- "version": "1.0.13",
- "resolved": "https://npme.walmart.com/@walmart/redux-store/-/redux-store-1.0.13.tgz",
- "integrity": "sha512-ax/pW70GP9SnZ8pDPcSSlA/oEG6m0JkUGT2F96piHa9BJRVWOIYPRCG5rSfadzTvSS1HVPC6fCBtSg9S2Pv3sA=="
+ "version": "1.0.14",
+ "resolved": "https://npme.walmart.com/@walmart/redux-store/-/redux-store-1.0.14.tgz",
+ "integrity": "sha512-yFTYK4fVYd4wEBZugBt/5A5lWCJnuUecdAQrUQmbqwY3iTpnKlL+MuAJwYYBXM7ISwmH2OYJcRItOZLQZHImQQ=="
},
"@walmart/schedule-mini-app": {
"version": "0.2.76",
--- package.json
@@ -67,7 +67,7 @@
"@walmart/allspark-home-mini-app": "0.4.0",
"@walmart/allspark-me-mini-app": "0.1.0",
"@walmart/ask-sam-mini-app": "0.28.0",
- "@walmart/config-components": "^1.0.25",
+ "@walmart/config-components": "^1.0.26",
"@walmart/counts-component-miniapp": "0.0.9",
"@walmart/exception-mini-app": "0.8.0",
"@walmart/feedback-all-spark-miniapp": "0.0.50",
@@ -83,7 +83,7 @@
"@walmart/react-native-env": "^0.1.0",
"@walmart/react-native-logger": "^1.26.0",
"@walmart/react-native-shared-navigation": "^0.4.0",
- "@walmart/redux-store": "^1.0.13",
+ "@walmart/redux-store": "^1.0.14",
"@walmart/schedule-mini-app": "0.2.76",
"@walmart/settings-mini-app": "1.2.3",
"@walmart/time-clock-mini-app": "0.3.3",
--- src/core/deviceInfoInit.ts
@@ -1,10 +1,9 @@
import type {DeviceInfo} from '@walmart/redux-store';
-import {getStore} from '@walmart/redux-store';
-import {deviceInfoProgress, deviceInfoSuccess, deviceInfoError} from '@walmart/redux-store/lib/commonjs/actions/deviceInfo.actions';
+import {deviceInfoActions} from '@walmart/redux-store';
import {DeviceConfig} from '@walmart/config-components';
export const initDeviceInfo = async () => {
- getStore().dispatch(deviceInfoProgress());
+ deviceInfoActions.deviceInfoProgress();
try {
const deviceInfo: DeviceInfo = {
brand: DeviceConfig.brand,
@@ -17,8 +16,8 @@ export const initDeviceInfo = async () => {
isEmulator: await DeviceConfig.isEmulator,
isTablet: DeviceConfig.isTablet,
};
- getStore().dispatch(deviceInfoSuccess(deviceInfo));
+ deviceInfoActions.deviceInfoSuccess(deviceInfo);
} catch (err) {
- getStore().dispatch(deviceInfoError(err));
+ deviceInfoActions.deviceInfoError(err);
}
};
--- src/redux/SharedSelectors.ts
@@ -1,4 +1,4 @@
-import {GlobalState, DeviceInfo} from '@walmart/redux-store';
+import {GlobalState} from '@walmart/redux-store';
import {createSelector} from 'reselect';
type KeyValueMap<T> = {[key: string]: T};
| update versions and fixes | update versions and fixes
|
f0621fafb4f52451512296ae575c5ac615e88a29 | --- packages/allspark-foundation/src/HTTP/client.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
import axios, { Axios, HeadersDefaults, AxiosInstance } from 'axios';
import { HttpOptions } from '@apollo/client';
import { Response } from 'node-fetch';
@@ -110,55 +109,101 @@ export class HttpClient extends Axios {
// --- Legacy Format Handling --- //
if (requestInterceptors || responseInterceptors) {
- warnForIncorrectInterceptors(featureId);
-
- requestInterceptors?.forEach((interceptor: RequestInterceptor) =>
- this.addInterceptor({ request: interceptor })
- );
- responseInterceptors?.forEach((interceptor: ResponseInterceptor) =>
- this.addInterceptor({ response: interceptor })
- );
+ this._addLegacyInterceptors({
+ requestInterceptors,
+ responseInterceptors,
+ });
}
}
/**
- * Merges config with existing config
+ * Adds legacy interceptors to instance
*/
- public configure = (config: Omit<HttpClientConfig, 'featureId'>) => {
- this.configured = true;
+ private _addLegacyInterceptors = (interceptors: {
+ requestInterceptors?: RequestInterceptor[];
+ responseInterceptors?: ResponseInterceptor[];
+ }) => {
+ warnForIncorrectInterceptors(this.featureId);
+
+ const { requestInterceptors, responseInterceptors } = interceptors;
+ requestInterceptors?.forEach((interceptor: RequestInterceptor) =>
+ this.addInterceptor({ request: interceptor })
+ );
+ responseInterceptors?.forEach((interceptor: ResponseInterceptor) =>
+ this.addInterceptor({ response: interceptor })
+ );
+ };
+ /**
+ * Merges http client config with existing config.
+ * WARNING: This does not merge interceptors or the cache config.
+ */
+ public mergeConfig = (
+ config: Omit<
+ HttpClientConfig,
+ 'interceptors' | 'featureId' | 'isFeatureInstance' | 'skipCacheSetup'
+ >
+ ) => {
+ // Extract fields that need special handling
+ // @ts-ignore - interceptors could still be in config
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ const { interceptors, cache, ...restConfig } = config;
+
+ // Merge config into defaults except for interceptors and cache.
+ // Existing interceptors would be overwritten this way. Need to be added separately.
+ // Cache on defaults is the actual instance
// @ts-ignore - mergeConfig exists but is not defined on type
this.defaults = axios.mergeConfig(this.defaults, restConfig);
- // Merge new config into existing config.
- // this.config is our own creation so we'll have to handle the merging. Some mini apps
- // refer to the config directly so we have to keep it updated.
- Object.assign(this.config, {
- ...config,
- headers: {
- ...(this.config.headers || {}),
- ...(config.headers || {}),
- },
- interceptors: [
- ...(this.config.interceptors || []),
- ...(config.interceptors || []),
- ],
- });
+ // Merge new config into existing config, cache config can be merged here.
+ // Interceptors again would be overritten this way. Need to be added separately.
+ // @ts-ignore - mergeConfig exists but is not defined on type
+ this.config = axios.mergeConfig(this.config, { cache, ...restConfig });
+ };
- // Extract custom fileds we must manually merge.
- const { interceptors, cache, ...restConfig } = config;
+ /**
+ * Configures the client with the given config.
+ * Intended to setup client after instance creation
+ */
+ public configure = (config: Omit<HttpClientConfig, 'featureId'>) => {
+ if (!this.configured) {
+ // Extract custom fields we must manually merge.
+ const {
+ interceptors,
+ // @ts-ignore - handling legacy format
+ requestInterceptors,
+ // @ts-ignore - handling legacy format
+ responseInterceptors,
+ } = config;
+
+ this.mergeConfig(config);
+
+ if (interceptors) {
+ this.addInterceptors(interceptors, { recursive: true });
+ }
- if (interceptors) {
- this.addInterceptors(interceptors, { recursive: true });
- }
+ // --- Legacy Format Handling --- //
+ if (requestInterceptors || responseInterceptors) {
+ this._addLegacyInterceptors({
+ requestInterceptors,
+ responseInterceptors,
+ });
+ }
- if (cache) {
- // @ts-ignore - clear cache instance, before creating a new one
- this.defaults.cache = null;
- setupCache(this as unknown as AxiosInstance, {
- ...cache,
- storage: getStorageForClient(this.featureId),
- });
+ if (config.cache) {
+ // @ts-ignore - clear cache instance, before creating a new one
+ this.defaults.cache = null;
+ setupCache(this as unknown as AxiosInstance, {
+ ...config.cache,
+ storage: this.storage,
+ });
+ }
+
+ this.configured = true;
+ } else {
+ console.warn(
+ `Attempted to configure Allspark Http Client (${this.featureId}) twice. A client should only be configured once.`
+ );
}
};
@@ -180,7 +225,7 @@ export class HttpClient extends Axios {
const existingClient = this._featureClientMap.get(featureId);
if (existingClient) {
if (config) {
- existingClient.configure(config);
+ existingClient.mergeConfig(config);
}
return existingClient;
}
@@ -197,17 +242,11 @@ export class HttpClient extends Axios {
}
// --- Merge Config --- //
- // Extract custom fileds we must manually merge.
+ // Extract fields we must manually merge.
const { interceptors = [], headers, ...restConfig } = config || {};
- // Cache on defaults would be the created cache instance, not the config;
- // Removing it so its not merged with defaults and a new cache is created
- // on the new instance.
- // @ts-ignore
- const { cache, ...parentDefaults } = this.defaults;
-
// @ts-ignore - mergeConfig exists but is not defined on type
- const mergedConfig = axios.mergeConfig(parentDefaults, {
+ const mergedConfig = axios.mergeConfig(this.config, {
...restConfig,
featureId,
isFeatureInstance: true,
@@ -276,7 +315,6 @@ export class HttpClient extends Axios {
* Actually calls use for given request/response interceptors
*/
private useInterceptor(interceptor: Interceptor) {
- this.configured = true;
if (interceptor.request) {
this.interceptors.request.use(
interceptor.request.fulfilled,
@@ -304,7 +342,6 @@ export class HttpClient extends Axios {
interceptor: Interceptor,
options?: { recursive: boolean }
) {
- this.configured = true;
this.config.interceptors.unshift(interceptor);
this.useInterceptor(interceptor);
@@ -324,7 +361,6 @@ export class HttpClient extends Axios {
interceptors: Interceptor[],
options?: { recursive: boolean }
) {
- this.configured = true;
interceptors.forEach((interceptor) =>
this.addInterceptor(interceptor, options)
);
@@ -340,6 +376,7 @@ export class HttpClient extends Axios {
...this.defaults.headers,
...this.defaults.headers.common,
...this.defaults.headers[method as keyof HeadersDefaults],
+ ...(this.config.headers || {}),
};
NON_HEADER_KEYS.forEach((key) => {
@@ -641,15 +678,6 @@ export class HttpClient extends Axios {
};
// --- Legacy Format Handling --- //
-
- /**
- * Merges config with existing config
- * @deprecated use `configure` instead
- */
- public mergeConfig = (config: HttpClientConfig) => {
- this.configure(config);
- };
-
/**
* Creates a new instance of HttpClient, merging current config and interceptors
* @deprecated use `createFeatureClient` instead
| fix: merging of http client config and defaults was error prone | fix: merging of http client config and defaults was error prone
|
55eb504460064f61c9cfccdd9004f1adb68b0800 | --- package-lock.json
@@ -8930,7 +8930,7 @@
"@walmart/react-native-shared-navigation": "1.0.2",
"@walmart/react-native-sumo-sdk": "2.6.0",
"@walmart/redux-store": "3.5.0",
- "@walmart/taskit-mini-app": "v2.56.0-953-0c9b829",
+ "@walmart/taskit-mini-app": "2.53.3",
"@walmart/ui-components": "1.15.1",
"axios": "~1.2.6",
"i18next": "^22.0.1",
| revert taskit | revert taskit
|
db951f410c64cd2ec9f176d214c4f8d5090c801d | --- jest.config.js
@@ -31,6 +31,7 @@ module.exports = {
'!<rootDir>/src/**/*.d.ts',
],
coverageReporters: ['lcov', 'text'],
+ //Todo: Update coverage to 90% once all tests are written
coverageThreshold: {
global: {
statements: 50,
| chore(ui): update jest config to 50% for now | chore(ui): update jest config to 50% for now
|
4d71a09322f8b9512b507746526ce9c3591f51e6 | --- src/components/RosterWidget/useRosterWidget.ts
@@ -8,6 +8,7 @@ import {
useDailyRoster,
useGetTeamsByStore,
useSupplyChainTeamsByBusinessUnit,
+ useSupplyChainShifts,
} from '../../hooks';
import {SupplyChainTeam} from '../../queries/schema.types';
import {
@@ -15,6 +16,10 @@ import {
associateIsClockedIn,
associateIsScheduled,
associateIsTardy,
+ associateIsScheduledWithShiftsForTotal,
+ associateIsClockedInWithShiftsForTotal,
+ associateIsAbsentWithShiftsForTotal,
+ associateIsTardyWithShiftsForTotal,
} from '../../utils';
//Todo: This should be coming from foundation-hub
@@ -30,6 +35,7 @@ export const useRosterWidget = (
const {t} = translationClient.useTranslation();
const {selectedTeamIds, refresh, widgetStyle, selectedShifts} = props;
const [widgetRefresh, setWidgetRefresh] = useState(false);
+ const {data: availableShifts} = useSupplyChainShifts();
const [state, setState] = useState<{
scheduledCount: number;
clockedInCount: number;
@@ -88,16 +94,56 @@ export const useRosterWidget = (
)
: [];
}, [teamDataForSite, isSiteDC, selectedShifts, selectedTeamIds]);
-
+ const getShiftNames = (selectedAllShifts: any) => {
+ return selectedAllShifts.map((shift: any) => shift.shiftName);
+ };
+ const shifts = getShiftNames(selectedShifts);
const configureRosterInfo = () => {
if (selectedTeamIds?.includes(TOTAL_STORE_TEAM_ID)) {
- const scheduledCount =
- rosterDataList?.filter(associateIsScheduled)?.length ?? 0;
- const clockedInCount =
- rosterDataList?.filter(associateIsClockedIn)?.length ?? 0;
- const absentCount =
- rosterDataList?.filter(associateIsAbsent)?.length ?? 0;
- const tardyCount = rosterDataList?.filter(associateIsTardy)?.length ?? 0;
+ const scheduledCount = rosterDataList?.filter((associate) => {
+ if (
+ availableShifts?.supplyChainShifts?.every((shift) =>
+ shifts.includes(shift.name),
+ )
+ ) {
+ return associateIsScheduled(associate);
+ } else {
+ return associateIsScheduledWithShiftsForTotal(associate, shifts);
+ }
+ }).length;
+ const clockedInCount = rosterDataList?.filter((associate) => {
+ if (
+ availableShifts?.supplyChainShifts?.every((shift) =>
+ shifts.includes(shift.name),
+ )
+ ) {
+ return associateIsClockedIn(associate);
+ } else {
+ return associateIsClockedInWithShiftsForTotal(associate, shifts);
+ }
+ }).length;
+ const absentCount = rosterDataList?.filter((associate) => {
+ if (
+ availableShifts?.supplyChainShifts?.every((shift) =>
+ shifts.includes(shift.name),
+ )
+ ) {
+ return associateIsAbsent(associate);
+ } else {
+ return associateIsAbsentWithShiftsForTotal(associate, shifts);
+ }
+ }).length;
+ const tardyCount = rosterDataList?.filter((associate) => {
+ if (
+ availableShifts?.supplyChainShifts?.every((shift) =>
+ shifts.includes(shift.name),
+ )
+ ) {
+ return associateIsTardy(associate);
+ } else {
+ return associateIsTardyWithShiftsForTotal(associate, shifts);
+ }
+ }).length;
setState({
scheduledCount: scheduledCount,
clockedInCount: clockedInCount,
--- src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen.tsx
@@ -310,7 +310,7 @@ export const SupplyChainRosterDetailScreen = ({
scheduledCount: teamRoster?.filter((associate) => {
if (
availableShifts?.supplyChainShifts?.every((shift) =>
- state.shiftIds.includes(shift.number),
+ state.shiftIds.includes(shift.name),
)
) {
return associateIsScheduled(associate);
| Updating count logic | Updating count logic
|
9497baa8d12b3ebacc353853f2383de248373e05 | --- package.json
@@ -118,7 +118,7 @@
"@walmart/me-at-walmart-common": "6.1.4",
"@walmart/me-at-walmart-container": "6.1.4",
"@walmart/metrics-mini-app": "0.22.4",
- "@walmart/mod-flex-mini-app": "1.17.5",
+ "@walmart/mod-flex-mini-app": "1.18.5",
"@walmart/moment-walmart": "1.0.4",
"@walmart/money-auth-shared-components": "0.1.6",
"@walmart/myteam-mini-app": "1.1.7",
--- yarn.lock
@@ -6537,9 +6537,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/mod-flex-mini-app@npm:1.17.5":
- version: 1.17.5
- resolution: "@walmart/mod-flex-mini-app@npm:1.17.5"
+"@walmart/mod-flex-mini-app@npm:1.18.5":
+ version: 1.18.5
+ resolution: "@walmart/mod-flex-mini-app@npm:1.18.5"
peerDependencies:
"@react-native-async-storage/async-storage": ^1.19.0
"@react-native-picker/picker": ^2.4.8
@@ -6590,7 +6590,7 @@ __metadata:
redux-thunk: ^2.4.0
uuid: ^3.3.2
wifi-store-locator: ^1.4.1
- checksum: 10c0/f1e4d4778aec7d69c72614c9004527e21e27130b88cf4304e9081eeb5cdcd11fd887c5077dbf6992e174705766dd4620ca6fedc1a8fbb45f95f301a66ba410ac
+ checksum: 10c0/3550b02b874adc0b352cbc163a8c71ce649099a69bb1a95fa2fb5c6c486df90052d50ce57da2a49a51968765f7b6588568e5548cac86be9e0738e907a6e29f39
languageName: node
linkType: hard
@@ -7732,7 +7732,7 @@ __metadata:
"@walmart/me-at-walmart-common": "npm:6.1.4"
"@walmart/me-at-walmart-container": "npm:6.1.4"
"@walmart/metrics-mini-app": "npm:0.22.4"
- "@walmart/mod-flex-mini-app": "npm:1.17.5"
+ "@walmart/mod-flex-mini-app": "npm:1.18.5"
"@walmart/moment-walmart": "npm:1.0.4"
"@walmart/money-auth-shared-components": "npm:0.1.6"
"@walmart/myteam-mini-app": "npm:1.1.7"
| update modflex version | update modflex version
|
ac5221ed90e219c0c09ec1f59c4eb12b1fbdb727 | --- package-lock.json
@@ -74,7 +74,7 @@
"@walmart/react-native-shared-navigation": "1.0.2",
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.5.0",
- "@walmart/receipt-check-miniapp": "1.9.2",
+ "@walmart/receipt-check-miniapp": "1.9.4",
"@walmart/redux-store": "3.1.3",
"@walmart/refrigeration-alarms-mini-app": "1.35.0",
"@walmart/returns-mini-app": "0.6.0",
@@ -5849,9 +5849,9 @@
}
},
"node_modules/@walmart/receipt-check-miniapp": {
- "version": "1.9.2",
- "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.9.2.tgz",
- "integrity": "sha512-QBtp+KR/nsjMJSLYaUH+i12z29H6zMjcwzU8g4TJyqZL7e+rpXRxyBKXuf9CLPhsZC6XyoJmHRUbVgkMmfYgNw==",
+ "version": "1.9.4",
+ "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.9.4.tgz",
+ "integrity": "sha512-/SfZgj/1Jgp08MKv3/fLoF16K84vIswT0Mzy9D6awD8dZi71XqvS8l2BpU8x5Hu/sDF34tDR+qX52KZvnysumA==",
"dependencies": {
"@walmart/tcnumber": "^2.3.3",
"@xstate/react": "^3.0.1",
@@ -25370,9 +25370,9 @@
"integrity": "sha512-VkGT8BSZOsxR4FJjxeu6ursO3qzAVZea6jEwT6KJsXgBJ9MIHhkBo78guM6kEbqqQl3SlGS/+5tbOxKdWrvStQ=="
},
"@walmart/receipt-check-miniapp": {
- "version": "1.9.2",
- "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.9.2.tgz",
- "integrity": "sha512-QBtp+KR/nsjMJSLYaUH+i12z29H6zMjcwzU8g4TJyqZL7e+rpXRxyBKXuf9CLPhsZC6XyoJmHRUbVgkMmfYgNw==",
+ "version": "1.9.4",
+ "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.9.4.tgz",
+ "integrity": "sha512-/SfZgj/1Jgp08MKv3/fLoF16K84vIswT0Mzy9D6awD8dZi71XqvS8l2BpU8x5Hu/sDF34tDR+qX52KZvnysumA==",
"requires": {
"@walmart/tcnumber": "^2.3.3",
"@xstate/react": "^3.0.1",
--- package.json
@@ -116,7 +116,7 @@
"@walmart/react-native-shared-navigation": "1.0.2",
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.5.0",
- "@walmart/receipt-check-miniapp": "1.9.2",
+ "@walmart/receipt-check-miniapp": "1.9.4",
"@walmart/redux-store": "3.1.3",
"@walmart/refrigeration-alarms-mini-app": "1.35.0",
"@walmart/returns-mini-app": "0.6.0",
| bump version | bump version
|
38f26fd22994a4f4f93adc9615bae27782b9c8ca | --- android/app/build.gradle
@@ -134,7 +134,7 @@ android {
applicationId "com.walmart.stores.allspark.beta"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 91
+ versionCode 92
versionName "1.0.6"
}
splits {
--- ios/AllSpark/Info.plist
@@ -34,7 +34,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>91</string>
+ <string>92</string>
<key>FirebaseAutomaticScreenReportingEnabled</key>
<false />
<key>LSApplicationQueriesSchemes</key>
| Incrementing build number | Incrementing build number
|
fd9939eba007789a537a448a63b3f24469ab0729 | --- android/app/src/main/java/com/walmart/stores/allspark/beta/MainActivity.kt
@@ -31,6 +31,9 @@ class MainActivity: ReactActivity() {
SplashScreen.show(this);
}
+ /**
+ * Handles Sumo push notification when app is in background, but not in a killed state.
+ */
override fun onNewIntent(intent: Intent?) {
super.onNewIntent(intent)
setIntent(intent)
| added comment for onNewIntent | added comment for onNewIntent
|
99ec1dc47769e1e7d19720eb0692dcb2577e89bb | --- .yarn/patches/react-native-vision-camera-npm-3.7.1-a55884f46c.patch
@@ -36,3 +36,23 @@ index f9b32285233a15f2f88395e85167f405a25dab91..a5b2dc6633bdeb4d37c404de7a3b0d73
import android.media.Image
import android.media.ImageReader
import android.os.Build
+diff --git a/android/src/main/java/com/mrousavy/camera/CameraView.kt b/android/src/main/java/com/mrousavy/camera/CameraView.kt
+index 4d6709875f37951140b4b1bef0f3428bbd129ec8..827c48970af114972601d00899b435615cbbe6e5 100644
+--- a/android/src/main/java/com/mrousavy/camera/CameraView.kt
++++ b/android/src/main/java/com/mrousavy/camera/CameraView.kt
+@@ -3,6 +3,7 @@ package com.mrousavy.camera
+ import android.annotation.SuppressLint
+ import android.content.Context
+ import android.hardware.camera2.CameraManager
++import android.media.AudioManager
+ import android.util.Log
+ import android.view.ScaleGestureDetector
+ import android.widget.FrameLayout
+@@ -89,6 +90,7 @@ class CameraView(context: Context) :
+ // private properties
+ private var isMounted = false
+ internal val cameraManager = context.getSystemService(Context.CAMERA_SERVICE) as CameraManager
++ internal val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+
+ // session
+ internal val cameraSession: CameraSession
--- yarn.lock
@@ -18883,7 +18883,7 @@ __metadata:
"react-native-vision-camera@patch:react-native-vision-camera@npm%3A3.7.1#~/.yarn/patches/react-native-vision-camera-npm-3.7.1-a55884f46c.patch":
version: 3.7.1
- resolution: "react-native-vision-camera@patch:react-native-vision-camera@npm%3A3.7.1#~/.yarn/patches/react-native-vision-camera-npm-3.7.1-a55884f46c.patch::version=3.7.1&hash=4f0b12"
+ resolution: "react-native-vision-camera@patch:react-native-vision-camera@npm%3A3.7.1#~/.yarn/patches/react-native-vision-camera-npm-3.7.1-a55884f46c.patch::version=3.7.1&hash=2c23fc"
peerDependencies:
react: "*"
react-native: "*"
@@ -18891,7 +18891,7 @@ __metadata:
peerDependenciesMeta:
react-native-worklets-core:
optional: true
- checksum: 10c0/03f2e612b7df9293abb5d311433545d664704540027452efef86e992ee1305edf80b3be9729e1e3649e5cd93926f17dd0e9a318b8323c7a781cde3d73f90a7fb
+ checksum: 10c0/babb14a433f86059787e0366a044142424f9076b193036200a4ccd8483349a9e751bcab6ff7dee6091a7c9e1903a6084daaca79f710146f3878e6c2a1d22aaac
languageName: node
linkType: hard
| Update patch of react-native-vision-camera | Update patch of react-native-vision-camera
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.