Merge pull request #35428 from Expensify/tgolen-implement-smartscangps

Add GPS coordinates to smartscanned images
Expensify · Feb 6, 2024 · 67a46f5 · 67a46f5
2 parents ebc2b7d + e83c24a
commit 67a46f5
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 4 deletions.
diff --git a/src/libs/API/parameters/RequestMoneyParams.ts b/src/libs/API/parameters/RequestMoneyParams.ts
@@ -24,6 +24,7 @@ type RequestMoneyParams = {
     taxCode: string;
     taxAmount: number;
     billable?: boolean;
+    gpsPoints?: string;
 };
 
 export default RequestMoneyParams;
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
@@ -1251,7 +1251,6 @@ function updateDistanceRequest(transactionID: string, transactionThreadReportID:
 
 /**
  * Request money from another user
- * @param amount - always in the smallest unit of the currency
  */
 function requestMoney(
     report: OnyxTypes.Report,
@@ -1272,6 +1271,7 @@ function requestMoney(
     policy = undefined,
     policyTags = undefined,
     policyCategories = undefined,
+    gpsPoints = undefined,
 ) {
     // If the report is iou or expense report, we should get the linked chat report to be passed to the getMoneyRequestInformation function
     const isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
@@ -1323,6 +1323,9 @@ function requestMoney(
         taxCode,
         taxAmount,
         billable,
+
+        // This needs to be a string of JSON because of limitations with the fetch() API and nested objects
+        gpsPoints: gpsPoints ? JSON.stringify(gpsPoints) : undefined,
     };
 
     API.write(WRITE_COMMANDS.REQUEST_MONEY, parameters, onyxData);

diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.js b/src/pages/iou/request/step/IOURequestStepConfirmation.js
@@ -1,6 +1,6 @@
 import lodashGet from 'lodash/get';
 import PropTypes from 'prop-types';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
@@ -19,7 +19,9 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import compose from '@libs/compose';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import getCurrentPosition from '@libs/getCurrentPosition';
 import * as IOUUtils from '@libs/IOUUtils';
+import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as ReportUtils from '@libs/ReportUtils';
@@ -103,6 +105,7 @@ function IOURequestStepConfirmation({
         [transaction.participants, personalDetails],
     );
     const isPolicyExpenseChat = useMemo(() => ReportUtils.isPolicyExpenseChat(ReportUtils.getRootParentReport(report)), [report]);
+    const formHasBeenSubmitted = useRef(false);
 
     useEffect(() => {
         if (!transaction || !transaction.originalCurrency) {
@@ -170,7 +173,7 @@ function IOURequestStepConfirmation({
      * @param {File} [receiptObj]
      */
     const requestMoney = useCallback(
-        (selectedParticipants, trimmedComment, receiptObj) => {
+        (selectedParticipants, trimmedComment, receiptObj, gpsPoints) => {
             IOU.requestMoney(
                 report,
                 transaction.amount,
@@ -190,6 +193,7 @@ function IOURequestStepConfirmation({
                 policy,
                 policyTags,
                 policyCategories,
+                gpsPoints,
             );
         },
         [report, transaction, transactionTaxCode, transactionTaxAmount, currentUserPersonalDetails.login, currentUserPersonalDetails.accountID, policy, policyTags, policyCategories],
@@ -225,6 +229,13 @@ function IOURequestStepConfirmation({
         (selectedParticipants) => {
             const trimmedComment = lodashGet(transaction, 'comment.comment', '').trim();
 
+            // Don't let the form be submitted multiple times while the navigator is waiting to take the user to a different page
+            if (formHasBeenSubmitted.current) {
+                return;
+            }
+
+            formHasBeenSubmitted.current = true;
+
             // If we have a receipt let's start the split bill by creating only the action, the transaction, and the group DM if needed
             if (iouType === CONST.IOU.TYPE.SPLIT && receiptFile) {
                 IOU.startSplitBill(
@@ -278,7 +289,26 @@ function IOURequestStepConfirmation({
             }
 
             if (receiptFile) {
-                requestMoney(selectedParticipants, trimmedComment, receiptFile);
+                getCurrentPosition(
+                    (successData) => {
+                        requestMoney(selectedParticipants, trimmedComment, receiptFile, {
+                            lat: successData.coords.latitude,
+                            long: successData.coords.longitude,
+                        });
+                    },
+                    (errorData) => {
+                        Log.info('[IOURequestStepConfirmation] getCurrentPosition failed', false, errorData);
+                        // When there is an error, the money can still be requested, it just won't include the GPS coordinates
+                        requestMoney(selectedParticipants, trimmedComment, receiptFile);
+                    },
+                    {
+                        // It's OK to get a cached location that is up to an hour old because the only accuracy needed is the country the user is in
+                        maximumAge: 1000 * 60 * 60,
+
+                        // 15 seconds, don't wait too long because the server can always fall back to using the IP address
+                        timeout: 15000,
+                    },
+                );
                 return;
             }