npm - @axelor/aos-mobile-hr - Versions diffs - 8.0.7 → 8.1.1 - Mend

@axelor/aos-mobile-hr 8.0.7 → 8.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (164) hide show

package/README.md CHANGED Viewed

@@ -23,7 +23,7 @@ Install the library :
 yarn add @axelor/aos-mobile-hr
 ```
-Compatibility with React v18.2.x and React Native v0.68.x.
+Compatibility with React v18.2.x and React Native v0.70.x.
 To add this package in your application, you need to add it in the _modules_ props of the component `Application` from @axelor/aos-mobile-core package.

package/lib/api/expense-api.js CHANGED Viewed

@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { createStandardSearch, getSearchCriterias, createStandardFetch, axiosApiProvider, } from '@axelor/aos-mobile-core';
-import { Expense } from '../types';
+import { createStandardSearch, getSearchCriterias, createStandardFetch, axiosApiProvider, getTypes, } from '@axelor/aos-mobile-core';
 const createExpenseDraftCriteria = userId => {
+    const Expense = getTypes().Expense;
     const criteria = [
         {
             fieldName: 'statusSelect',
             operator: '=',
-            value: Expense.statusSelect.Draft,
+            value: Expense?.statusSelect.Draft,
         },
     ];
     if (userId != null) {
@@ -46,12 +46,13 @@ const createMyExpenseCriteria = (searchValue, userId) => {
     return criteria;
 };
 const createExpenseToValidateCriteria = (searchValue, user) => {
+    const Expense = getTypes().Expense;
     const criteria = [
         getSearchCriterias('hr_expense', searchValue),
         {
             fieldName: 'statusSelect',
             operator: '=',
-            value: Expense.statusSelect.WaitingValidation,
+            value: Expense?.statusSelect.WaitingValidation,
         },
     ];
     if (!user?.employee?.hrManager) {

package/lib/api/expense-api.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"expense-api.js","sourceRoot":"","sources":["../../src/api/expense-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,gBAAgB,~~GACjB~~,MAAM,yBAAyB,CAAC;~~AACjC~~,~~OAAO~~,~~EAAC~~,~~OAAO~~,~~EAAC,~~MAAM,~~UAAU~~,~~CAAC~~;~~AAEjC~~,MAAM,~~0BAA0B~~,GAAG,~~MAAM~~,CAAC,~~EAAE~~;~~IAC1C~~,MAAM,QAAQ,GAAG;QACf;YACE,SAAS,EAAE,cAAc;YACzB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,OAAO,~~CAAC~~,YAAY,CAAC,KAAK;~~SAClC~~;KACF,CAAC;IAEF,IAAI,MAAM,IAAI,IAAI,EAAE;QAClB,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,kBAAkB;YAC7B,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;KACJ;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE;IACtD,MAAM,QAAQ,GAAG,CAAC,kBAAkB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;IAEjE,IAAI,MAAM,IAAI,IAAI,EAAE;QAClB,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,kBAAkB;YAC7B,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;KACJ;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,+BAA+B,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE;IAC5D,MAAM,QAAQ,GAAG;QACf,kBAAkB,CAAC,YAAY,EAAE,WAAW,CAAC;QAC7C;YACE,SAAS,EAAE,cAAc;YACzB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,OAAO,~~CAAC~~,YAAY,CAAC,iBAAiB;~~SAC9C~~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"}
1	+ {"version":3,"file":"expense-api.js","sourceRoot":"","sources":["../../src/api/expense-api.js"],"names":[],"mappings":"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"}

package/lib/api/project-api.d.ts CHANGED Viewed

@@ -3,12 +3,13 @@ export function searchProject({ searchValue, page, activeCompanyId }: {
     page?: number;
     activeCompanyId: any;
 }): Promise<any>;
-export function searchProjectTask({ searchValue, page, userId, projectId, isAssignedToRequired, }: {
+export function searchProjectTask({ searchValue, page, userId, projectId, isAssignedToRequired, isMemberRequired, }: {
     searchValue: any;
     page?: number;
     userId: any;
     projectId: any;
     isAssignedToRequired: any;
+    isMemberRequired: any;
 }): Promise<any>;
 export function searchProduct({ searchValue, page }: {
     searchValue: any;

package/lib/api/project-api.js CHANGED Viewed

@@ -81,10 +81,18 @@ export async function searchProject({ searchValue, page = 0, activeCompanyId })
         page,
     });
 }
-export async function searchProjectTask({ searchValue, page = 0, userId, projectId, isAssignedToRequired, }) {
+export async function searchProjectTask({ searchValue, page = 0, userId, projectId, isAssignedToRequired, isMemberRequired, }) {
     return createStandardSearch({
         model: 'com.axelor.apps.project.db.ProjectTask',
         criteria: createProjectTaskCriteria(searchValue, userId, projectId, isAssignedToRequired),
+        ...(isMemberRequired && {
+            domain: ':user MEMBER OF self.project.membersUserSet',
+            domainContext: {
+                user: {
+                    id: userId,
+                },
+            },
+        }),
         fieldKey: 'hr_projectTask',
         sortKey: 'hr_projectTask',
         page,

package/lib/api/project-api.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"project-api.js","sourceRoot":"","sources":["../../src/api/project-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AAEjC,MAAM,qBAAqB,GAAG,CAAC,WAAW,EAAE,eAAe,EAAE,EAAE;IAC7D,MAAM,QAAQ,GAAG;QACf;YACE,SAAS,EAAE,WAAW;YACtB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,IAAI;SACZ;QACD;YACE,SAAS,EAAE,iBAAiB;YAC5B,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,IAAI;SACZ;QACD,kBAAkB,CAAC,YAAY,EAAE,WAAW,CAAC;KAC9C,CAAC;IAEF,IAAI,eAAe,IAAI,IAAI,EAAE;QAC3B,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,YAAY;YACvB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,eAAe;SACvB,CAAC,CAAC;KACJ;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAChC,WAAW,EACX,MAAM,EACN,SAAS,EACT,oBAAoB,EACpB,EAAE;IACF,MAAM,QAAQ,GAAG,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC,CAAC;IAErE,IAAI,oBAAoB,EAAE;QACxB,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,6BAA6B;YACxC,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;KACJ;IAED,IAAI,SAAS,IAAI,IAAI,EAAE;QACrB,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,YAAY;YACvB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;KACJ;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,WAAW,CAAC,EAAE;IAC1C,OAAO;QACL;YACE,SAAS,EAAE,YAAY;YACvB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,IAAI;SACZ;QACD;YACE,SAAS,EAAE,OAAO;YAClB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,SAAS;SACjB;QACD,kBAAkB,CAAC,gBAAgB,EAAE,WAAW,CAAC;KAClD,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAAC,WAAW,EAAE,IAAI,GAAG,CAAC,EAAE,eAAe,EAAC;IAC1E,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,oCAAoC;QAC3C,QAAQ,EAAE,qBAAqB,CAAC,WAAW,EAAE,eAAe,CAAC;QAC7D,QAAQ,EAAE,YAAY;QACtB,OAAO,EAAE,YAAY;QACrB,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACtC,WAAW,EACX,IAAI,GAAG,CAAC,EACR,MAAM,EACN,SAAS,EACT,oBAAoB,~~GACrB~~;IACC,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,wCAAwC;QAC/C,QAAQ,EAAE,yBAAyB,CACjC,WAAW,EACX,MAAM,EACN,SAAS,EACT,oBAAoB,CACrB;QACD,QAAQ,EAAE,gBAAgB;QAC1B,OAAO,EAAE,gBAAgB;QACzB,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAAC,WAAW,EAAE,IAAI,GAAG,CAAC,EAAC;IACzD,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,iCAAiC;QACxC,QAAQ,EAAE,qBAAqB,CAAC,WAAW,CAAC;QAC5C,QAAQ,EAAE,YAAY;QACtB,OAAO,EAAE,YAAY;QACrB,IAAI;KACL,CAAC,CAAC;AACL,CAAC"}
1	+ {"version":3,"file":"project-api.js","sourceRoot":"","sources":["../../src/api/project-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AAEjC,MAAM,qBAAqB,GAAG,CAAC,WAAW,EAAE,eAAe,EAAE,EAAE;IAC7D,MAAM,QAAQ,GAAG;QACf;YACE,SAAS,EAAE,WAAW;YACtB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,IAAI;SACZ;QACD;YACE,SAAS,EAAE,iBAAiB;YAC5B,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,IAAI;SACZ;QACD,kBAAkB,CAAC,YAAY,EAAE,WAAW,CAAC;KAC9C,CAAC;IAEF,IAAI,eAAe,IAAI,IAAI,EAAE;QAC3B,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,YAAY;YACvB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,eAAe;SACvB,CAAC,CAAC;KACJ;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAChC,WAAW,EACX,MAAM,EACN,SAAS,EACT,oBAAoB,EACpB,EAAE;IACF,MAAM,QAAQ,GAAG,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC,CAAC;IAErE,IAAI,oBAAoB,EAAE;QACxB,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,6BAA6B;YACxC,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;KACJ;IAED,IAAI,SAAS,IAAI,IAAI,EAAE;QACrB,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,YAAY;YACvB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;KACJ;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,WAAW,CAAC,EAAE;IAC1C,OAAO;QACL;YACE,SAAS,EAAE,YAAY;YACvB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,IAAI;SACZ;QACD;YACE,SAAS,EAAE,OAAO;YAClB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,SAAS;SACjB;QACD,kBAAkB,CAAC,gBAAgB,EAAE,WAAW,CAAC;KAClD,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAAC,WAAW,EAAE,IAAI,GAAG,CAAC,EAAE,eAAe,EAAC;IAC1E,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,oCAAoC;QAC3C,QAAQ,EAAE,qBAAqB,CAAC,WAAW,EAAE,eAAe,CAAC;QAC7D,QAAQ,EAAE,YAAY;QACtB,OAAO,EAAE,YAAY;QACrB,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACtC,WAAW,EACX,IAAI,GAAG,CAAC,EACR,MAAM,EACN,SAAS,EACT,oBAAoB,EACpB,gBAAgB,GACjB;IACC,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,wCAAwC;QAC/C,QAAQ,EAAE,yBAAyB,CACjC,WAAW,EACX,MAAM,EACN,SAAS,EACT,oBAAoB,CACrB;QACD,GAAG,CAAC,gBAAgB,IAAI;YACtB,MAAM,EAAE,6CAA6C;YACrD,aAAa,EAAE;gBACb,IAAI,EAAE;oBACJ,EAAE,EAAE,MAAM;iBACX;aACF;SACF,CAAC;QACF,QAAQ,EAAE,gBAAgB;QAC1B,OAAO,EAAE,gBAAgB;QACzB,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAAC,WAAW,EAAE,IAAI,GAAG,CAAC,EAAC;IACzD,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,iCAAiC;QACxC,QAAQ,EAAE,qBAAqB,CAAC,WAAW,CAAC;QAC5C,QAAQ,EAAE,YAAY;QACtB,OAAO,EAAE,YAAY;QACrB,IAAI;KACL,CAAC,CAAC;AACL,CAAC"}

package/lib/api/timer-api.js CHANGED Viewed

@@ -15,8 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { axiosApiProvider, createStandardFetch, createStandardSearch, getDateZonesISOString, getEndOfDay, getSearchCriterias, getStartOfDay, } from '@axelor/aos-mobile-core';
-import { Time } from '../types';
+import { axiosApiProvider, createStandardFetch, createStandardSearch, getDateZonesISOString, getEndOfDay, getSearchCriterias, getStartOfDay, getTypes, } from '@axelor/aos-mobile-core';
 const createTimerCriteria = (searchValue, userId, fromDate, toDate) => {
     const criteria = [
         getSearchCriterias('hr_timer', searchValue),
@@ -52,6 +51,7 @@ const createTimerCriteria = (searchValue, userId, fromDate, toDate) => {
     return criteria;
 };
 const createActiveTimerCriteria = userId => {
+    const Timer = getTypes().Timer;
     const criteria = createTimerCriteria(null, userId);
     criteria.push({
         operator: 'OR',
@@ -59,12 +59,12 @@ const createActiveTimerCriteria = userId => {
             {
                 fieldName: 'statusSelect',
                 operator: '=',
-                value: Time.statusSelect.InProgress,
+                value: Timer?.statusSelect.InProgress,
             },
             {
                 fieldName: 'statusSelect',
                 operator: '=',
-                value: Time.statusSelect.Paused,
+                value: Timer?.statusSelect.Paused,
             },
         ],
     });

package/lib/api/timer-api.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"timer-api.js","sourceRoot":"","sources":["../../src/api/timer-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,qBAAqB,EACrB,WAAW,EACX,kBAAkB,EAClB,aAAa,~~GACd~~,~~MAAM~~,~~yBAAyB~~,~~CAAC;AACjC,OAAO,EAAC,IAAI,EAAC,~~MAAM,~~UAAU~~,CAAC;~~AAE9B~~,MAAM,mBAAmB,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE;IACpE,MAAM,QAAQ,GAAG;QACf,kBAAkB,CAAC,UAAU,EAAE,WAAW,CAAC;QAC3C;YACE,SAAS,EAAE,kBAAkB;YAC7B,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,MAAM;SACd;QACD;YACE,SAAS,EAAE,yBAAyB;YACpC,QAAQ,EAAE,QAAQ;SACnB;KACF,CAAC;IAEF,IAAI,QAAQ,IAAI,IAAI,IAAI,MAAM,IAAI,IAAI,EAAE;QACtC,MAAM,SAAS,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;QACxD,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;QAElD,QAAQ,CAAC,IAAI,CAAC;YACZ,QAAQ,EAAE,KAAK;YACf,QAAQ,EAAE;gBACR;oBACE,SAAS,EAAE,eAAe;oBAC1B,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,SAAS;iBACjB;gBACD;oBACE,SAAS,EAAE,eAAe;oBAC1B,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,OAAO;iBACf;aACF;SACF,CAAC,CAAC;KACJ;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,MAAM,CAAC,EAAE;IACzC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEnD,QAAQ,CAAC,IAAI,CAAC;QACZ,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE;YACR;gBACE,SAAS,EAAE,cAAc;gBACzB,QAAQ,EAAE,GAAG;gBACb,KAAK,EAAE,~~IAAI~~,~~CAAC~~,YAAY,CAAC,UAAU;~~aACpC~~;YACD;gBACE,SAAS,EAAE,cAAc;gBACzB,QAAQ,EAAE,GAAG;gBACb,KAAK,EAAE,~~IAAI~~,~~CAAC~~,YAAY,CAAC,MAAM;~~aAChC~~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"}
1	+ {"version":3,"file":"timer-api.js","sourceRoot":"","sources":["../../src/api/timer-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,qBAAqB,EACrB,WAAW,EACX,kBAAkB,EAClB,aAAa,EACb,QAAQ,GACT,MAAM,yBAAyB,CAAC;AAEjC,MAAM,mBAAmB,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE;IACpE,MAAM,QAAQ,GAAG;QACf,kBAAkB,CAAC,UAAU,EAAE,WAAW,CAAC;QAC3C;YACE,SAAS,EAAE,kBAAkB;YAC7B,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,MAAM;SACd;QACD;YACE,SAAS,EAAE,yBAAyB;YACpC,QAAQ,EAAE,QAAQ;SACnB;KACF,CAAC;IAEF,IAAI,QAAQ,IAAI,IAAI,IAAI,MAAM,IAAI,IAAI,EAAE;QACtC,MAAM,SAAS,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;QACxD,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;QAElD,QAAQ,CAAC,IAAI,CAAC;YACZ,QAAQ,EAAE,KAAK;YACf,QAAQ,EAAE;gBACR;oBACE,SAAS,EAAE,eAAe;oBAC1B,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,SAAS;iBACjB;gBACD;oBACE,SAAS,EAAE,eAAe;oBAC1B,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,OAAO;iBACf;aACF;SACF,CAAC,CAAC;KACJ;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,MAAM,CAAC,EAAE;IACzC,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC,KAAK,CAAC;IAE/B,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEnD,QAAQ,CAAC,IAAI,CAAC;QACZ,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE;YACR;gBACE,SAAS,EAAE,cAAc;gBACzB,QAAQ,EAAE,GAAG;gBACb,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,UAAU;aACtC;YACD;gBACE,SAAS,EAAE,cAAc;gBACzB,QAAQ,EAAE,GAAG;gBACb,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,MAAM;aAClC;SACF;KACF,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,+BAA+B,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;IACvD,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEnD,MAAM,cAAc,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IACvC,QAAQ,CAAC,IAAI,CAAC;QACZ,QAAQ,EAAE,KAAK;QACf,QAAQ,EAAE;YACR;gBACE,SAAS,EAAE,eAAe;gBAC1B,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE,cAAc;aACtB;YACD;gBACE,SAAS,EAAE,eAAe;gBAC1B,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE,YAAY;aACpB;SACF;KACF,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,EAC/B,WAAW,GAAG,IAAI,EAClB,MAAM,EACN,QAAQ,EACR,MAAM,EACN,IAAI,GAAG,CAAC,GACT;IACC,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,+BAA+B;QACtC,QAAQ,EAAE,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC;QACpE,QAAQ,EAAE,UAAU;QACpB,OAAO,EAAE,UAAU;QACnB,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EAAC,OAAO,EAAC;IAC5C,OAAO,mBAAmB,CAAC;QACzB,KAAK,EAAE,+BAA+B;QACtC,EAAE,EAAE,OAAO;QACX,QAAQ,EAAE,UAAU;KACrB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EAAC,MAAM,EAAC;IAC7C,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,+BAA+B;QACtC,QAAQ,EAAE,yBAAyB,CAAC,MAAM,CAAC;QAC3C,QAAQ,EAAE,UAAU;QACpB,OAAO,EAAE,gBAAgB;QACzB,oBAAoB,EAAE,CAAC;QACvB,IAAI,EAAE,CAAC;KACR,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC;IACvD,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,+BAA+B;QACtC,QAAQ,EAAE,+BAA+B,CAAC,MAAM,EAAE,IAAI,CAAC;QACvD,QAAQ,EAAE,UAAU;QACpB,oBAAoB,EAAE,IAAI;QAC1B,IAAI,EAAE,CAAC;KACR,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,EAAC,KAAK,EAAC;IACvC,OAAO,gBAAgB,CAAC,IAAI,CAAC;QAC3B,GAAG,EAAE,yBAAyB;QAC9B,IAAI,EACF,KAAK,CAAC,aAAa,IAAI,IAAI;YACzB,CAAC,CAAC,EAAC,GAAG,KAAK,EAAE,aAAa,EAAE,qBAAqB,CAAC,KAAK,CAAC,aAAa,CAAC,EAAC;YACvE,CAAC,CAAC,KAAK;KACZ,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,EAAC,KAAK,EAAC;IACvC,OAAO,gBAAgB,CAAC,GAAG,CAAC;QAC1B,GAAG,EAAE,iCAAiC,KAAK,CAAC,EAAE,EAAE;QAChD,IAAI,EACF,KAAK,CAAC,aAAa,IAAI,IAAI;YACzB,CAAC,CAAC,EAAC,GAAG,KAAK,EAAE,aAAa,EAAE,qBAAqB,CAAC,KAAK,CAAC,aAAa,CAAC,EAAC;YACvE,CAAC,CAAC,KAAK;KACZ,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAC;IAClE,OAAO,gBAAgB,CAAC,GAAG,CAAC;QAC1B,GAAG,EAAE,iCAAiC,OAAO,EAAE;QAC/C,IAAI,EAAE;YACJ,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,QAAQ;SACnB;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,EAAC,OAAO,EAAC;IACzC,OAAO,gBAAgB,CAAC,MAAM,CAAC;QAC7B,GAAG,EAAE,yCAAyC,OAAO,EAAE;KACxD,CAAC,CAAC;AACL,CAAC"}

package/lib/api/timesheet-api.js CHANGED Viewed

@@ -15,8 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { axiosApiProvider, createStandardFetch, createStandardSearch, getSearchCriterias, } from '@axelor/aos-mobile-core';
-import { Timesheet } from '../types';
+import { axiosApiProvider, createStandardFetch, createStandardSearch, getSearchCriterias, getTypes, } from '@axelor/aos-mobile-core';
 const createTimesheetCriteria = (searchValue, userId) => {
     return [
         {
@@ -28,12 +27,13 @@ const createTimesheetCriteria = (searchValue, userId) => {
     ];
 };
 const createTimesheetToValidateCriteria = (searchValue, user) => {
+    const Timesheet = getTypes().Timesheet;
     const criteria = [
         getSearchCriterias('hr_timesheet', searchValue),
         {
             fieldName: 'statusSelect',
             operator: '=',
-            value: Timesheet.statusSelect.WaitingValidation,
+            value: Timesheet?.statusSelect.WaitingValidation,
         },
     ];
     if (!user?.employee?.hrManager) {
@@ -46,11 +46,12 @@ const createTimesheetToValidateCriteria = (searchValue, user) => {
     return criteria;
 };
 const createDraftTimesheetCriteria = (userId, fromDate, toDate, isOverlapAllowed) => {
+    const Timesheet = getTypes().Timesheet;
     const criteria = [
         {
             fieldName: 'statusSelect',
             operator: '=',
-            value: Timesheet.statusSelect.Draft,
+            value: Timesheet?.statusSelect.Draft,
         },
     ];
     if (userId != null) {

package/lib/api/timesheet-api.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"timesheet-api.js","sourceRoot":"","sources":["../../src/api/timesheet-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,kBAAkB,~~GACnB~~,~~MAAM~~,~~yBAAyB~~,~~CAAC;AACjC,OAAO,EAAC,SAAS,EAAC,~~MAAM,~~UAAU~~,CAAC;~~AAEnC~~,MAAM,uBAAuB,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE;IACtD,OAAO;QACL;YACE,SAAS,EAAE,kBAAkB;YAC7B,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,MAAM;SACd;QACD,kBAAkB,CAAC,cAAc,EAAE,WAAW,CAAC;KAChD,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,iCAAiC,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE;IAC9D,MAAM,QAAQ,GAAG;QACf,kBAAkB,CAAC,cAAc,EAAE,WAAW,CAAC;QAC/C;YACE,SAAS,EAAE,cAAc;YACzB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,SAAS,~~CAAC~~,YAAY,CAAC,iBAAiB;~~SAChD~~;KACF,CAAC;IAEF,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE;QAC9B,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,yBAAyB;YACpC,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,IAAI,EAAE,EAAE;SAChB,CAAC,CAAC;KACJ;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,4BAA4B,GAAG,CACnC,MAAM,EACN,QAAQ,EACR,MAAM,EACN,gBAAgB,EAChB,EAAE;IACF,MAAM,QAAQ,GAAG;QACf;YACE,SAAS,EAAE,cAAc;YACzB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,SAAS,~~CAAC~~,YAAY,CAAC,KAAK;~~SACpC~~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"}
1	+ {"version":3,"file":"timesheet-api.js","sourceRoot":"","sources":["../../src/api/timesheet-api.js"],"names":[],"mappings":"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"}

package/lib/components/atoms/ExpenseCard/ExpenseCard.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import React from 'react';
 interface ExpenseCardProps {
     style?: any;
     statusSelect: number;
@@ -11,5 +12,5 @@ interface ExpenseCardProps {
     employeeManagerId?: number;
     employeeName?: string;
 }
-declare const ExpenseCard: ({ style, onPress, onValidate, onSend, statusSelect, expenseId, expenseSeq, periodeCode, inTaxTotal, employeeManagerId, employeeName, }: ExpenseCardProps) => JSX.Element;
+declare const ExpenseCard: ({ style, onPress, onValidate, onSend, statusSelect, expenseId, expenseSeq, periodeCode, inTaxTotal, employeeManagerId, employeeName, }: ExpenseCardProps) => React.JSX.Element;
 export default ExpenseCard;

package/lib/components/atoms/ExpenseCard/ExpenseCard.js CHANGED Viewed

@@ -18,30 +18,38 @@
 import React, { useMemo } from 'react';
 import { StyleSheet, View } from 'react-native';
 import { Text, useThemeColor, checkNullString, CardIconButton, ObjectCard, } from '@axelor/aos-mobile-ui';
-import { AnomalyBubble, useTranslator, useSelector, } from '@axelor/aos-mobile-core';
-import { Expense } from '../../../types';
+import { AnomalyBubble, useTranslator, useSelector, usePermitted, useTypes, useTypeHelpers, } from '@axelor/aos-mobile-core';
 const ExpenseCard = ({ style, onPress, onValidate = () => { }, onSend = () => { }, statusSelect, expenseId, expenseSeq, periodeCode, inTaxTotal, employeeManagerId, employeeName, }) => {
     const Colors = useThemeColor();
     const I18n = useTranslator();
+    const { readonly } = usePermitted({
+        modelName: 'com.axelor.apps.hr.db.Expense',
+    });
+    const { Expense } = useTypes();
+    const { getItemColor } = useTypeHelpers();
     const { user } = useSelector((state) => state.user);
     const userCanValidate = useMemo(() => {
         if ((user?.employee?.hrManager || employeeManagerId === user.id) &&
-            statusSelect === Expense.statusSelect.WaitingValidation) {
+            statusSelect === Expense?.statusSelect.WaitingValidation) {
             return true;
         }
         return false;
-    }, [employeeManagerId, statusSelect, user?.employee?.hrManager, user.id]);
+    }, [
+        Expense?.statusSelect,
+        employeeManagerId,
+        statusSelect,
+        user?.employee?.hrManager,
+        user.id,
+    ]);
     const isDefaultDisplay = useMemo(() => {
-        if ((statusSelect === Expense.statusSelect.WaitingValidation &&
-            userCanValidate) ||
-            statusSelect === Expense.statusSelect.Draft) {
-            return false;
-        }
-        return true;
-    }, [userCanValidate, statusSelect]);
+        return (readonly ||
+            ((statusSelect !== Expense?.statusSelect.WaitingValidation ||
+                !userCanValidate) &&
+                statusSelect !== Expense?.statusSelect.Draft));
+    }, [Expense?.statusSelect, readonly, statusSelect, userCanValidate]);
     const borderStyle = useMemo(() => {
-        return getBorderStyle(Expense.getStatusColor(statusSelect, Colors)).border;
-    }, [Colors, statusSelect]);
+        return getBorderStyle(getItemColor(Expense?.statusSelect, statusSelect)?.background).border;
+    }, [Expense?.statusSelect, getItemColor, statusSelect]);
     return (<View style={[styles.container, style]}>
       <View style={styles.containerCard}>
         <ObjectCard onPress={onPress} style={borderStyle} leftContainerFlex={2} iconLeftMargin={10} upperTexts={{
@@ -75,20 +83,20 @@ const ExpenseCard = ({ style, onPress, onValidate = () => { }, onSend = () => {
         }}/>
       </View>
       {!isDefaultDisplay && (<View style={styles.iconContainer}>
-          <CardIconButton iconName={statusSelect === Expense.statusSelect.Draft
+          <CardIconButton iconName={statusSelect === Expense?.statusSelect.Draft
                 ? 'send-fill'
                 : 'check-lg'} iconColor={Colors.primaryColor.foreground} onPress={() => {
-                statusSelect === Expense.statusSelect.Draft
+                statusSelect === Expense?.statusSelect.Draft
                     ? onSend()
                     : onValidate();
             }} style={styles.cardIconButton}/>
         </View>)}
     </View>);
 };
-const getBorderStyle = Colors => StyleSheet.create({
+const getBorderStyle = (color) => StyleSheet.create({
     border: {
         borderLeftWidth: 7,
-        borderLeftColor: Colors.background,
+        borderLeftColor: color,
         marginHorizontal: 0,
         marginVertical: 0,
     },

package/lib/components/atoms/ExpenseCard/ExpenseCard.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ExpenseCard.js","sourceRoot":"","sources":["../../../../src/components/atoms/ExpenseCard/ExpenseCard.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EACL,IAAI,EACJ,aAAa,EACb,eAAe,EACf,cAAc,EACd,UAAU,GACX,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,aAAa,EACb,aAAa,EACb,WAAW,~~GACZ~~,~~MAAM~~,~~yBAAyB~~,~~CAAC;AACjC~~,~~OAAO~~,~~EAAC~~,~~OAAO~~,~~EAAC,~~MAAM,~~gBAAgB~~,CAAC;~~AAgBvC~~,MAAM,WAAW,GAAG,CAAC,EACnB,KAAK,EACL,OAAO,EACP,UAAU,GAAG,GAAG,EAAE,GAAE,CAAC,EACrB,MAAM,GAAG,GAAG,EAAE,GAAE,CAAC,EACjB,YAAY,EACZ,SAAS,EACT,UAAU,EACV,WAAW,EACX,UAAU,EACV,iBAAiB,EACjB,YAAY,GACK,EAAE,EAAE;IACrB,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;~~IAE7B~~,MAAM,EAAC,IAAI,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEvD,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,EAAE;QACnC,IACE,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,IAAI,iBAAiB,KAAK,IAAI,CAAC,EAAE,CAAC;YAC5D,YAAY,KAAK,OAAO,~~CAAC~~,YAAY,CAAC,iBAAiB,~~EACvD~~;YACA,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC,EAAE,~~CAAC~~,~~iBAAiB,~~EAAE,YAAY,~~EAAE~~,IAAI,EAAE,QAAQ,EAAE,SAAS,~~EAAE,~~IAAI,CAAC,EAAE,CAAC,CAAC~~,CAAC~~;~~IAE1E~~,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,EAAE;QACpC,~~IACE~~,CAAC,YAAY,KAAK,OAAO,~~CAAC~~,YAAY,CAAC,iBAAiB;~~YACtD~~,eAAe,CAAC;~~YAClB~~,YAAY,KAAK,OAAO,~~CAAC~~,YAAY,CAAC,KAAK,~~EAC3C;YACA~~,~~OAAO~~,~~KAAK,~~CAAC;~~SACd;QACD~~,~~OAAO~~,~~IAAI~~,CAAC~~;IACd~~,~~CAAC~~,EAAE,~~CAAC~~,~~eAAe~~,EAAE,YAAY,CAAC,CAAC,CAAC;~~IAEpC~~,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE;QAC/B,OAAO,cAAc,~~CAAC~~,~~OAAO~~,CAAC,~~cAAc~~,~~CAAC~~,YAAY,EAAE,~~MAAM~~,CAAC,~~CAAC~~,CAAC,MAAM,CAAC;~~IAC7E~~,CAAC,EAAE,CAAC,~~MAAM~~,EAAE,YAAY,CAAC,CAAC,CAAC;~~IAE3B~~,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CACrC;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAChC;QAAA,CAAC,UAAU,CACT,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,KAAK,CAAC,CAAC,WAAW,CAAC,CACnB,iBAAiB,CAAC,CAAC,CAAC,CAAC,CACrB,cAAc,CAAC,CAAC,EAAE,CAAC,CACnB,UAAU,CAAC,CAAC;YACV,KAAK,EAAE;gBACL;oBACE,eAAe,EAAE,CACf,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CACjC;oBAAA,CAAC,aAAa,CACZ,UAAU,CAAC,SAAS,CACpB,QAAQ,CAAC,CAAC,SAAS,CAAC,CACpB,oBAAoB,EAEtB;oBAAA,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAChD;sBAAA,CAAC,UAAU,CACb;oBAAA,EAAE,IAAI,CACR;kBAAA,EAAE,IAAI,CAAC,CACR;iBACF;gBACD;oBACE,WAAW,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,WAAW,EAAE;oBACtD,MAAM,EAAE,eAAe,CAAC,WAAW,CAAC;iBACrC;gBACD;oBACE,QAAQ,EAAE,aAAa;oBACvB,aAAa,EAAE,YAAY;oBAC3B,UAAU,EAAE,IAAI;iBACjB;aACF;SACF,CAAC,CACF,UAAU,CAAC,CAAC;YACV,KAAK,EAAE;gBACL;oBACE,eAAe,EAAE,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAC/C,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,UAAU,IACvC,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,IAAI,IAAI;4BAC3C,CAAC,CAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM;4BACvC,CAAC,CAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IACrC,EAAE,CAAC,EAAE,IAAI,CAAC,CACX;iBACF;aACF;SACF,CAAC,EAEN;MAAA,EAAE,IAAI,CACN;MAAA,CAAC,CAAC,gBAAgB,IAAI,CACpB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAChC;UAAA,CAAC,cAAc,CACb,QAAQ,CAAC,CACP,YAAY,KAAK,OAAO,~~CAAC~~,YAAY,CAAC,KAAK;~~gBACzC~~,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,UAAU,CACf,CACD,SAAS,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CAC1C,OAAO,CAAC,CAAC,GAAG,EAAE;gBACZ,YAAY,KAAK,OAAO,~~CAAC~~,YAAY,CAAC,KAAK;~~oBACzC~~,CAAC,CAAC,MAAM,EAAE;oBACV,CAAC,CAAC,UAAU,EAAE,CAAC;YACnB,CAAC,CAAC,CACF,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,EAEjC;QAAA,EAAE,IAAI,CAAC,CACR,CACH;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,~~MAAM,~~CAAC,EAAE,~~CAC9B~~,UAAU,CAAC,MAAM,CAAC;IAChB,MAAM,EAAE;QACN,eAAe,EAAE,CAAC;QAClB,eAAe,EAAE,~~MAAM,CAAC,UAAU~~;~~QAClC~~,gBAAgB,EAAE,CAAC;QACnB,cAAc,EAAE,CAAC;KAClB;CACF,CAAC,CAAC;AAEL,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,SAAS,EAAE;QACT,OAAO,EAAE,MAAM;QACf,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,QAAQ;QACpB,IAAI,EAAE,CAAC;QACP,KAAK,EAAE,KAAK;QACZ,gBAAgB,EAAE,EAAE;QACpB,cAAc,EAAE,cAAc;QAC9B,SAAS,EAAE,QAAQ;KACpB;IACD,aAAa,EAAE;QACb,IAAI,EAAE,CAAC;KACR;IACD,cAAc,EAAE;QACd,IAAI,EAAE,CAAC;QACP,MAAM,EAAE,CAAC;QACT,UAAU,EAAE,CAAC;KACd;IACD,aAAa,EAAE;QACb,IAAI,EAAE,CAAC;KACR;IACD,cAAc,EAAE;QACd,aAAa,EAAE,KAAK;KACrB;IACD,SAAS,EAAE;QACT,SAAS,EAAE,QAAQ;QACnB,UAAU,EAAE,CAAC;KACd;IACD,KAAK,EAAE;QACL,SAAS,EAAE,OAAO;KACnB;CACF,CAAC,CAAC;AAEH,eAAe,WAAW,CAAC"}
1	+ {"version":3,"file":"ExpenseCard.js","sourceRoot":"","sources":["../../../../src/components/atoms/ExpenseCard/ExpenseCard.tsx"],"names":[],"mappings":"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"}

package/lib/components/atoms/ExpenseLineCard/ExpenseLineCard.d.ts CHANGED Viewed

@@ -1,7 +1,9 @@
+import React from 'react';
 interface ExpenseLineCardProps {
     expenseId: number;
     expenseDate?: string;
     projectName?: string;
+    projectTaskName?: string;
     totalAmount?: string;
     currency?: string;
     displayText?: string;
@@ -11,5 +13,5 @@ interface ExpenseLineCardProps {
     onLongPress: () => void;
     setCardHeight: (height: any) => void;
 }
-declare const ExpenseLineCard: ({ expenseId, expenseDate, projectName, totalAmount, currency, displayText, fromCity, toCity, distance, onLongPress, setCardHeight, }: ExpenseLineCardProps) => JSX.Element;
+declare const ExpenseLineCard: ({ expenseId, expenseDate, projectName, projectTaskName, totalAmount, currency, displayText, fromCity, toCity, distance, onLongPress, setCardHeight, }: ExpenseLineCardProps) => React.JSX.Element;
 export default ExpenseLineCard;

package/lib/components/atoms/ExpenseLineCard/ExpenseLineCard.js CHANGED Viewed

@@ -17,10 +17,9 @@
  */
 import React, { useMemo } from 'react';
 import { Dimensions, StyleSheet, TouchableOpacity, View } from 'react-native';
-import { Text, useThemeColor, ObjectCard, Icon, capitalizeFirstLetter, } from '@axelor/aos-mobile-ui';
+import { capitalizeFirstLetter, Icon, ObjectCard, Text, TextUnit, useThemeColor, } from '@axelor/aos-mobile-ui';
 import { AnomalyBubble, DateDisplay, useSelector, useTranslator, } from '@axelor/aos-mobile-core';
-import TextUnit from '../TextUnit/TextUnit';
-const ExpenseLineCard = ({ expenseId, expenseDate, projectName, totalAmount, currency, displayText, fromCity, toCity, distance, onLongPress, setCardHeight, }) => {
+const ExpenseLineCard = ({ expenseId, expenseDate, projectName, projectTaskName, totalAmount, currency, displayText, fromCity, toCity, distance, onLongPress, setCardHeight, }) => {
     const I18n = useTranslator();
     const Colors = useThemeColor();
     const { user } = useSelector((state) => state.user);
@@ -46,6 +45,11 @@ const ExpenseLineCard = ({ expenseId, expenseDate, projectName, totalAmount, cur
                     hideIfNull: true,
                     style: [styles.details, styles.italic],
                 },
+                {
+                    indicatorText: projectTaskName,
+                    hideIfNull: true,
+                    style: [styles.details, styles.italic],
+                },
                 {
                     customComponent: (<View style={styles.cityContainer}>
                   <Text>{capitalizeFirstLetter(fromCity)}</Text>

package/lib/components/atoms/ExpenseLineCard/ExpenseLineCard.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ExpenseLineCard.js","sourceRoot":"","sources":["../../../../src/components/atoms/ExpenseLineCard/ExpenseLineCard.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC5E,OAAO,EACL,IAAI,EACJ,~~aAAa,EACb,~~UAAU,EACV,IAAI,EACJ,~~qBAAqB~~,~~GACtB~~,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,aAAa,EACb,WAAW,EACX,WAAW,EACX,aAAa,GACd,MAAM,yBAAyB,CAAC;~~AACjC~~,~~OAAO,QAAQ,~~MAAM,~~sBAAsB,CAAC;AAgB5C,MAAM,~~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"}
1	+ {"version":3,"file":"ExpenseLineCard.js","sourceRoot":"","sources":["../../../../src/components/atoms/ExpenseLineCard/ExpenseLineCard.tsx"],"names":[],"mappings":"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"}

package/lib/components/atoms/TimeCard/TimeCard.d.ts CHANGED Viewed

@@ -1,4 +1,6 @@
+import React from 'react';
 interface TimeCardProps {
+    mode: number;
     statusSelect: number;
     project?: string;
     task?: string;
@@ -12,5 +14,5 @@ interface TimeCardProps {
     isSmallCard?: boolean;
     style?: any;
 }
-declare const TimeCard: ({ statusSelect, project, task, manufOrder, operation, comments, date, duration, durationUnit, isBorderColor, isSmallCard, style, }: TimeCardProps) => JSX.Element;
+declare const TimeCard: ({ mode, statusSelect, project, task, manufOrder, operation, comments, date, duration, durationUnit, isBorderColor, isSmallCard, style, }: TimeCardProps) => React.JSX.Element;
 export default TimeCard;

package/lib/components/atoms/TimeCard/TimeCard.js CHANGED Viewed

@@ -17,15 +17,18 @@
  */
 import React, { useMemo } from 'react';
 import { StyleSheet, View } from 'react-native';
-import { ObjectCard, useThemeColor } from '@axelor/aos-mobile-ui';
-import { DateDisplay, useTranslator } from '@axelor/aos-mobile-core';
-import TextUnit from '../TextUnit/TextUnit';
+import { ObjectCard, TextUnit } from '@axelor/aos-mobile-ui';
+import { DateDisplay, useTranslator, useTypes, useTypeHelpers, } from '@axelor/aos-mobile-core';
 import { Time } from '../../../types';
 import { getDurationUnit } from '../../../utils';
-const TimeCard = ({ statusSelect, project, task, manufOrder, operation, comments, date, duration, durationUnit, isBorderColor = true, isSmallCard = false, style, }) => {
+const TimeCard = ({ mode, statusSelect, project, task, manufOrder, operation, comments, date, duration, durationUnit, isBorderColor = true, isSmallCard = false, style, }) => {
     const I18n = useTranslator();
-    const Colors = useThemeColor();
-    const styles = useMemo(() => getStyles(Time.getStatusColor(statusSelect, Colors), isSmallCard), [Colors, isSmallCard, statusSelect]);
+    const { Timer, Timesheet } = useTypes();
+    const { getItemColor } = useTypeHelpers();
+    const styles = useMemo(() => {
+        const timeObject = mode === Time.mode.Timer ? Timer : Timesheet;
+        return getStyles(getItemColor(timeObject?.statusSelect, statusSelect)?.background, isSmallCard);
+    }, [Timer, Timesheet, getItemColor, isSmallCard, mode, statusSelect]);
     return (<View style={style}>
       <ObjectCard touchable={false} showArrow={false} leftContainerFlex={1.3} style={[styles.container, isBorderColor && styles.borderColor]} upperTexts={{
             items: [
@@ -69,7 +72,7 @@ const getStyles = (color, isSmallCard) => StyleSheet.create({
     },
     borderColor: {
         borderLeftWidth: 7,
-        borderLeftColor: color.background,
+        borderLeftColor: color,
     },
     subTitle: {
         fontStyle: 'italic',

package/lib/components/atoms/TimeCard/TimeCard.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"TimeCard.js","sourceRoot":"","sources":["../../../../src/components/atoms/TimeCard/TimeCard.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,~~EAAQ~~,UAAU,EAAE,~~aAAa~~,EAAC,MAAM,uBAAuB,CAAC;~~AACvE~~,OAAO,~~EAAC~~,WAAW,~~EAAE~~,aAAa,~~EAAC~~,~~MAAM~~,~~yBAAyB~~,~~CAAC;AACnE~~,~~OAAO~~,~~QAAQ,~~MAAM,~~sBAAsB~~,CAAC;~~AAC5C~~,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;~~AAiB~~/C,MAAM,QAAQ,GAAG,CAAC,EAChB,YAAY,EACZ,OAAO,EACP,IAAI,EACJ,UAAU,EACV,SAAS,EACT,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,YAAY,EACZ,aAAa,GAAG,IAAI,EACpB,WAAW,GAAG,KAAK,EACnB,KAAK,GACS,EAAE,EAAE;IAClB,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,~~aAAa~~,EAAE,CAAC;~~IAE/B~~,MAAM,MAAM,GAAG,OAAO,~~CACpB~~,GAAG,EAAE,~~CAAC~~,~~SAAS~~,CAAC,IAAI,CAAC,~~cAAc~~,CAAC,YAAY,EAAE,~~MAAM~~,CAAC,EAAE,WAAW,CAAC,~~EACvE~~,CAAC,~~MAAM~~,EAAE,WAAW,EAAE,YAAY,CAAC,~~CACpC~~,CAAC;~~IAEF~~,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CACjB;MAAA,CAAC,UAAU,CACT,SAAS,CAAC,CAAC,KAAK,CAAC,CACjB,SAAS,CAAC,CAAC,KAAK,CAAC,CACjB,iBAAiB,CAAC,CAAC,GAAG,CAAC,CACvB,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,aAAa,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC,CAC/D,UAAU,CAAC,CAAC;YACV,KAAK,EAAE;gBACL;oBACE,WAAW,EAAE,CAAC,OAAO,IAAI,UAAU,CAAC,IAAI,GAAG;oBAC3C,OAAO,EAAE,IAAI;oBACb,aAAa,EAAE,CAAC;iBACjB;gBACD;oBACE,WAAW,EAAE,CAAC,WAAW,IAAI,CAAC,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC;oBACzD,aAAa,EAAE,CAAC;oBAChB,UAAU,EAAE,IAAI;oBAChB,KAAK,EAAE,MAAM,CAAC,QAAQ;iBACvB;gBACD;oBACE,WAAW,EAAE,CAAC,WAAW,IAAI,QAAQ;oBACrC,aAAa,EAAE,CAAC;oBAChB,UAAU,EAAE,IAAI;oBAChB,KAAK,EAAE,MAAM,CAAC,QAAQ;iBACvB;aACF;SACF,CAAC,CACF,UAAU,CAAC,CAAC;YACV,KAAK,EAAE,MAAM,CAAC,MAAM;YACpB,KAAK,EAAE;gBACL;oBACE,eAAe,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAG;iBAC7C;gBACD;oBACE,eAAe,EAAE,CACf,CAAC,QAAQ,CACP,KAAK,CAAC,CAAC,QAAQ,CAAC,CAChB,IAAI,CAAC,CAAC,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAC1C,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,EACvB,CACH;iBACF;aACF;SACF,CAAC,EAEN;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,~~KAAY~~,EAAE,WAAoB,EAAE,EAAE,~~CACvD~~,UAAU,CAAC,MAAM,CAAC;IAChB,SAAS,EAAE;QACT,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG;QACrC,cAAc,EAAE,QAAQ;QACxB,gBAAgB,EAAE,CAAC;QACnB,cAAc,EAAE,CAAC;KAClB;IACD,WAAW,EAAE;QACX,eAAe,EAAE,CAAC;QAClB,eAAe,EAAE,KAAK~~,CAAC,UAAU~~;~~KAClC~~;IACD,QAAQ,EAAE;QACR,SAAS,EAAE,QAAQ;QACnB,SAAS,EAAE,CAAC;KACb;IACD,MAAM,EAAE;QACN,UAAU,EAAE,UAAU;KACvB;IACD,QAAQ,EAAE;QACR,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KAC/B;CACF,CAAC,CAAC;AAEL,eAAe,QAAQ,CAAC"}
1	+ {"version":3,"file":"TimeCard.js","sourceRoot":"","sources":["../../../../src/components/atoms/TimeCard/TimeCard.tsx"],"names":[],"mappings":"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"}

package/lib/components/atoms/TimesheetCard/TimesheetCard.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import React from 'react';
 interface TimesheetCardProps {
     statusSelect: number;
     startDate: string;
@@ -9,5 +10,5 @@ interface TimesheetCardProps {
     style?: any;
     onPress: () => void;
 }
-declare const TimesheetCard: ({ statusSelect, startDate, endDate, company, totalDuration, durationUnit, employeeName, style, onPress, }: TimesheetCardProps) => JSX.Element;
+declare const TimesheetCard: ({ statusSelect, startDate, endDate, company, totalDuration, durationUnit, employeeName, style, onPress, }: TimesheetCardProps) => React.JSX.Element;
 export default TimesheetCard;

package/lib/components/atoms/TimesheetCard/TimesheetCard.js CHANGED Viewed

@@ -17,15 +17,14 @@
  */
 import React, { useMemo } from 'react';
 import { StyleSheet, View } from 'react-native';
-import { ObjectCard, useThemeColor } from '@axelor/aos-mobile-ui';
-import { useTranslator, PeriodDisplay } from '@axelor/aos-mobile-core';
-import TextUnit from '../TextUnit/TextUnit';
-import { Timesheet } from '../../../types';
+import { ObjectCard, TextUnit } from '@axelor/aos-mobile-ui';
+import { PeriodDisplay, useTranslator, useTypes, useTypeHelpers, } from '@axelor/aos-mobile-core';
 import { getDurationUnit } from '../../../utils';
 const TimesheetCard = ({ statusSelect, startDate, endDate, company, totalDuration, durationUnit, employeeName, style, onPress, }) => {
     const I18n = useTranslator();
-    const Colors = useThemeColor();
-    const styles = useMemo(() => getStyles(Timesheet.getStatusColor(statusSelect, Colors)), [Colors, statusSelect]);
+    const { Timesheet } = useTypes();
+    const { getItemColor } = useTypeHelpers();
+    const styles = useMemo(() => getStyles(getItemColor(Timesheet?.statusSelect, statusSelect)?.background), [Timesheet?.statusSelect, getItemColor, statusSelect]);
     return (<View style={style}>
       <ObjectCard style={[styles.container, styles.borderColor]} leftContainerFlex={2} onPress={onPress} upperTexts={{
             items: [
@@ -54,14 +53,14 @@ const TimesheetCard = ({ statusSelect, startDate, endDate, company, totalDuratio
         }}/>
     </View>);
 };
-const getStyles = color => StyleSheet.create({
+const getStyles = (color) => StyleSheet.create({
     container: {
         marginHorizontal: 1,
         marginVertical: 1,
     },
     borderColor: {
         borderLeftWidth: 7,
-        borderLeftColor: color.background,
+        borderLeftColor: color,
     },
     datesInterval: {
         marginBottom: 15,

package/lib/components/atoms/TimesheetCard/TimesheetCard.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"TimesheetCard.js","sourceRoot":"","sources":["../../../../src/components/atoms/TimesheetCard/TimesheetCard.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAE,~~aAAa~~,EAAC,MAAM,uBAAuB,CAAC;~~AAChE~~,OAAO,~~EAAC~~,aAAa,~~EAAE~~,aAAa,~~EAAC~~,~~MAAM,yBAAyB,CAAC;AACrE,OAAO,~~QAAQ,~~MAAM~~,~~sBAAsB~~,~~CAAC;AAC5C~~,~~OAAO,EAAC,SAAS,EAAC,~~MAAM,~~gBAAgB~~,CAAC;~~AACzC~~,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;AAc/C,MAAM,aAAa,GAAG,CAAC,EACrB,YAAY,EACZ,SAAS,EACT,OAAO,EACP,OAAO,EACP,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,KAAK,EACL,OAAO,GACY,EAAE,EAAE;IACvB,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,~~MAAM~~,GAAG,~~aAAa~~,EAAE,CAAC;~~IAE~~/B,MAAM,MAAM,GAAG,OAAO,CACpB,GAAG,EAAE,~~CAAC~~,SAAS,~~CAAC~~,~~SAAS~~,CAAC,~~cAAc~~,~~CAAC~~,YAAY,EAAE,~~MAAM~~,CAAC,~~CAAC~~,~~EAC/D~~,CAAC,~~MAAM~~,EAAE,YAAY,CAAC,~~CACvB~~,CAAC;IAEF,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CACjB;MAAA,CAAC,UAAU,CACT,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAC9C,iBAAiB,CAAC,CAAC,CAAC,CAAC,CACrB,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,UAAU,CAAC,CAAC;YACV,KAAK,EAAE;gBACL;oBACE,eAAe,EAAE,CACf,CAAC,aAAa,CACZ,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,EAC5B,CACH;iBACF;gBACD;oBACE,QAAQ,EAAE,eAAe;oBACzB,WAAW,EAAE,OAAO;oBACpB,aAAa,EAAE,CAAC;oBAChB,KAAK,EAAE,MAAM,CAAC,QAAQ;iBACvB;gBAED;oBACE,QAAQ,EAAE,aAAa;oBACvB,WAAW,EAAE,YAAY;oBACzB,KAAK,EAAE,MAAM,CAAC,QAAQ;oBACtB,UAAU,EAAE,IAAI;iBACjB;aACF;SACF,CAAC,CACF,UAAU,CAAC,CAAC;YACV,KAAK,EAAE;gBACL;oBACE,eAAe,EAAE,CACf,CAAC,QAAQ,CACP,KAAK,CAAC,CAAC,aAAa,CAAC,CACrB,IAAI,CAAC,CAAC,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAC1C,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,EACvB,CACH;iBACF;aACF;SACF,CAAC,EAEN;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,~~KAAK,~~CAAC,EAAE,~~CACxB~~,UAAU,CAAC,MAAM,CAAC;IAChB,SAAS,EAAE;QACT,gBAAgB,EAAE,CAAC;QACnB,cAAc,EAAE,CAAC;KAClB;IACD,WAAW,EAAE;QACX,eAAe,EAAE,CAAC;QAClB,eAAe,EAAE,KAAK~~,CAAC,UAAU~~;~~KAClC~~;IACD,aAAa,EAAE;QACb,YAAY,EAAE,EAAE;KACjB;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,IAAI;KACjB;IACD,QAAQ,EAAE;QACR,SAAS,EAAE,UAAU;QACrB,UAAU,EAAE,EAAE;KACf;CACF,CAAC,CAAC;AAEL,eAAe,aAAa,CAAC"}
1	+ {"version":3,"file":"TimesheetCard.js","sourceRoot":"","sources":["../../../../src/components/atoms/TimesheetCard/TimesheetCard.tsx"],"names":[],"mappings":"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"}

package/lib/components/atoms/index.d.ts CHANGED Viewed

@@ -1,5 +1,4 @@
 export { default as ExpenseCard } from "./ExpenseCard/ExpenseCard";
 export { default as ExpenseLineCard } from "./ExpenseLineCard/ExpenseLineCard";
-export { default as TextUnit } from "./TextUnit/TextUnit";
 export { default as TimeCard } from "./TimeCard/TimeCard";
 export { default as TimesheetCard } from "./TimesheetCard/TimesheetCard";

package/lib/components/atoms/index.js CHANGED Viewed

@@ -17,7 +17,6 @@
  */
 export { default as ExpenseCard } from './ExpenseCard/ExpenseCard';
 export { default as ExpenseLineCard } from './ExpenseLineCard/ExpenseLineCard';
-export { default as TextUnit } from './TextUnit/TextUnit';
 export { default as TimeCard } from './TimeCard/TimeCard';
 export { default as TimesheetCard } from './TimesheetCard/TimesheetCard';
 //# sourceMappingURL=index.js.map

package/lib/components/atoms/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/atoms/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAC,OAAO,IAAI,~~QAAQ,EAAC,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAC,OAAO,IAAI,~~aAAa,EAAC,MAAM,+BAA+B,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/atoms/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,+BAA+B,CAAC"}

package/lib/components/molecules/ExpenseAddPopup/ExpenseAddPopup.d.ts CHANGED Viewed

@@ -4,4 +4,5 @@ declare function ExpenseAddPopup({ style, visible, onClose, selectedItems }: {
     visible: any;
     onClose: any;
     selectedItems: any;
-}): JSX.Element;
+}): React.JSX.Element;
+import React from 'react';

package/lib/components/molecules/ExpenseDetailsValidationButton/ExpenseDetailsValidationButton.d.ts CHANGED Viewed

@@ -3,4 +3,5 @@ declare function ExpenseDetailsValidationButton({ expense, mode, isManualCreatio
     expense: any;
     mode: any;
     isManualCreation: any;
-}): JSX.Element;
+}): React.JSX.Element;
+import React from 'react';