@controleonline/ui-common 1.2.81 → 1.2.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@controleonline/ui-common",
-  "version": "1.2.81",
+  "version": "1.2.82",
   "author": "ControleOnline",
   "description": "ControleOnline Common Quasar UI Component",
   "license": "MIT",

package/src/react/pages/Devices/detail/DeviceDetailPaymentSection.js

@@ -10,31 +10,35 @@ import styles from '../../DeviceDetailPage.styles';
  */
 export default function DeviceDetailPaymentSection(ctx) {
   const {
-    showPdvPaymentTypesTab, renderHelpButton, deviceId, savePaymentTypeConfigs, savingPaymentTypes,
+    showPdvPaymentTypesTab,
+    renderHelpButton,
+    deviceId,
+    savePaymentTypeConfigs,
+    savingPaymentTypes,
+    currentCompany,
+    configs,
   } = ctx;
 
   if (!showPdvPaymentTypesTab) return null;
 
   return (
-        <View style={styles.section}>
-          <View style={styles.sectionHeaderRow}>
-            <Text style={styles.sectionTitle}>
-              <Icon name="credit-card" size={13} /> {'  '}Pagamentos do device
-            </Text>
-            {renderHelpButton(
-              'Pagamentos do device',
-              'Selecione os meios de pagamento que este device pode exibir e usar nas opções de pagamento. Os wallets entram só para organizar a lista.',
-            )}
-          </View>
-          <PaymentTypesByWalletTab
-            currentCompanyId={currentCompany?.id}
-            configs={configs}
-            disableSelection={savingPaymentTypes}
-            isSaving={savingPaymentTypes}
-            onPersistSelectedPaymentTypeIds={savePaymentTypeConfigs}
-          />
-        </View>
-      )}
-
+    <View style={styles.section}>
+      <View style={styles.sectionHeaderRow}>
+        <Text style={styles.sectionTitle}>
+          <Icon name="credit-card" size={13} /> {'  '}Pagamentos do device
+        </Text>
+        {renderHelpButton(
+          'Pagamentos do device',
+          'Selecione os meios de pagamento que este device pode exibir e usar nas opções de pagamento. Os wallets entram só para organizar a lista.',
+        )}
+      </View>
+      <PaymentTypesByWalletTab
+        currentCompanyId={currentCompany?.id}
+        configs={configs}
+        disableSelection={savingPaymentTypes}
+        isSaving={savingPaymentTypes}
+        onPersistSelectedPaymentTypeIds={savePaymentTypeConfigs}
+      />
+    </View>
   );
 }

package/src/react/pages/Devices/detail/DeviceDetailScreen.js

@@ -326,7 +326,8 @@ const DeviceDetailScreen = () => {
     shouldShowOrderVisibility,
     shouldShowRemotePayment,
     shouldShowDeviceBehavior,
-    shouldShowRemoteCommands
+    shouldShowRemoteCommands,
+    currentCompany,
   } = { ...state, ...loaders, ...actions, ...saves };
 
   const detailCtx = {
@@ -357,6 +358,7 @@ const DeviceDetailScreen = () => {
     showPdvMovementTab, showPdvPaymentTypesTab, showPdvOperationTab,
     inflowData, productTotal, wallets, filteredProducts, search, setSearch,
     loadingMovementData, deviceId, savePaymentTypeConfigs, savingPaymentTypes,
+    configs, currentCompany,
   };
 
   const {

package/src/react/pages/Devices/detail/useDeviceDetailStateA.js

@@ -337,6 +337,10 @@ export default function useDeviceDetailStateA() {
     () =>
       String(runtimeDevice?.type || runtimeDevice?.deviceType || '')
         .trim()
+        .toUpperCase(),
+    [runtimeDevice?.deviceType, runtimeDevice?.type],
+  );
+
   return {
     navigation,
     deviceId,
@@ -480,5 +484,6 @@ export default function useDeviceDetailStateA() {
     appVersion,
     runtimeDeviceId,
     runtimeDeviceType,
+    currentCompany,
   };
 }

package/src/react/pages/Devices/detail/useDeviceDetailStateB.js

@@ -51,9 +51,7 @@ export default function useDeviceDetailStateB(deps) {
     setAlias, editingAlias, setEditingAlias, aliasInput, setAliasInput, savingAlias, setSavingAlias, removingDevice, setRemovingDevice, aliasInputRef, skipAliasSyncFromStoreRef, isOpen,
     hasLocalPaymentGateway, paymentDeviceOptions, displayOptions, printerOptions, selectedPosOperationModeOption, pickerMode, packageVersion, appVersion, runtimeDeviceId, runtimeDeviceType,
   } = deps;
-        .toUpperCase(),
-    [runtimeDevice?.deviceType, runtimeDevice?.type],
-  );
+
   const isEditingRuntimeDevice = useMemo(
     () =>
       !!runtimeDeviceId &&
@@ -64,8 +62,37 @@ export default function useDeviceDetailStateB(deps) {
 
   const resolveDeviceContext = useCallback(async () => {
     if (deviceString && deviceType) {
+      return {
+        deviceData: null,
+        deviceString,
+        deviceType,
+      };
+    }
+
+    if (!deviceId) {
+      return {
+        deviceData: null,
+        deviceString: '',
+        deviceType: '',
+      };
+    }
+
+    const fetchedDevice = await actionsRef.current.deviceActions
+      .get(deviceId)
+      .catch(() => null);
+
+    return {
+      deviceData: fetchedDevice,
+      deviceString: String(fetchedDevice?.device || '').trim(),
+      deviceType: String(fetchedDevice?.type || fetchedDevice?.deviceType || '')
+        .trim()
+        .toUpperCase(),
+    };
+  }, [deviceId, deviceString, deviceType]);
+
   return {
     isEditingRuntimeDevice,
     resolveDeviceContext,
   };
 }
+