diff --git a/App.js b/App.js
index acab69af..8d5f1b44 100644
--- a/App.js
+++ b/App.js
@@ -2,8 +2,9 @@ import { FontAwesome5 } from '@expo/vector-icons';
import { AppLoading } from 'expo';
import { Asset } from 'expo-asset';
import * as Font from 'expo-font';
+import { StatusBar } from 'expo-status-bar';
import React, { useState } from 'react';
-import { Platform, StatusBar, StyleSheet, View } from 'react-native';
+import { Platform, StyleSheet, View } from 'react-native';
import { SafeAreaProvider } from 'react-native-safe-area-context';
import * as Sentry from 'sentry-expo';
import Colors from './constants/Colors';
@@ -32,7 +33,7 @@ export default function App(props) {
return (
- {Platform.OS === 'ios' && }
+ {Platform.OS === 'ios' && }
diff --git a/components/product/StoreProducts.js b/components/product/StoreProducts.js
index 7e91494e..381323db 100644
--- a/components/product/StoreProducts.js
+++ b/components/product/StoreProducts.js
@@ -5,7 +5,11 @@ import { View } from 'react-native';
import { FlatList } from 'react-native-gesture-handler';
import Colors from '../../constants/Colors';
import Window from '../../constants/Layout';
-import { SpaceBetweenRowContainer } from '../../styled/shared';
+import {
+ ColumnContainer,
+ RowContainer,
+ SpaceBetweenRowContainer,
+} from '../../styled/shared';
import { StoreDetailText } from '../../styled/store';
import { Body, ButtonContainer, Subtitle, Title } from '../BaseComponents';
import StoreCard from '../store/StoreCard';
@@ -17,31 +21,37 @@ function StoreProducts({ navigation, store, products, showDefaultStore }) {
-
-
- Products
- {products.length > 0 && (
-
- recently delivered
-
- )}
-
-
-
- navigation.navigate('Products', {
- products,
- navigation,
- store,
- })
- }>
- {products.length > 0 && (
- {`See all ${products.length}`}
- )}
-
-
+
+
+
+ Products
+ {products.length > 0 && (
+
+ recently delivered
+
+ )}
+
+
+ navigation.navigate('Products', {
+ products,
+ navigation,
+ store,
+ })
+ }>
+ {products.length > 0 && (
+ {`See all ${products.length}`}
+ )}
+
+
+ {store.stocksOtherVendors && (
+
+ This store regularly stocks additional produce from other vendors.
+
+ )}
+
-
- No deliveries in the last 7 days...check back later!
+
+ No Healthy Corners deliveries in the last 7 days. Check back
+ later!
}
diff --git a/components/store/AcceptedPrograms.js b/components/store/AcceptedPrograms.js
index 76cbca43..c3483389 100644
--- a/components/store/AcceptedPrograms.js
+++ b/components/store/AcceptedPrograms.js
@@ -14,7 +14,7 @@ import ProgramTag from './ProgramTag';
* */
const programToDesc = {
- EBT: 'Accepts SNAP/EBT',
+ 'SNAP/EBT': 'Accepts SNAP/EBT',
WIC: 'WIC approved',
'SNAP Match':
'Spend $5 with SNAP and include fresh produce in purchase to get $5 free on fresh produce',
@@ -60,7 +60,7 @@ export default function AcceptedPrograms({
return (
- {snapOrEbtAccepted && }
+ {snapOrEbtAccepted && }
{wic && }
{couponProgramPartner && }
{rewardsAccepted && }
diff --git a/components/store/ProgramTag.js b/components/store/ProgramTag.js
index 0a210ad6..0510c8c9 100644
--- a/components/store/ProgramTag.js
+++ b/components/store/ProgramTag.js
@@ -40,7 +40,7 @@ function ProgramTag({ program, tag = false, selected = false, selectedFunc }) {
// they enter the wrong string of words
if (
(program.toLowerCase() === 'wic' && program !== 'WIC') ||
- (program.toLowerCase() === 'ebt' && program !== 'EBT')
+ (program.toLowerCase() === 'snap/ebt' && program !== 'SNAP/EBT')
) {
programLabel = program.toUpperCase();
}
@@ -54,7 +54,7 @@ function ProgramTag({ program, tag = false, selected = false, selectedFunc }) {
}
const labelToIcon = {
- EBT: 'credit-card',
+ 'SNAP/EBT': 'credit-card',
WIC: 'heart',
'SNAP Match': 'carrot',
'Healthy Rewards': 'star',
diff --git a/components/store/StoreCard.js b/components/store/StoreCard.js
index 60a9dcd8..342c48bf 100644
--- a/components/store/StoreCard.js
+++ b/components/store/StoreCard.js
@@ -90,7 +90,7 @@ export default function StoreCard({ store, storeList, seeDistance }) {
flexWrap: 'wrap',
marginTop: 6,
}}>
- {snapOrEbtAccepted && }
+ {snapOrEbtAccepted && }
{wic && }
{couponProgramPartner && }
{rewardsAccepted && }
diff --git a/constants/RecordIds.js b/constants/RecordIds.js
index c8436ab1..d70b4456 100644
--- a/constants/RecordIds.js
+++ b/constants/RecordIds.js
@@ -3,7 +3,6 @@ import { env } from '../environment';
const RecordIds = {
testCustomerId: null,
guestCustomerId: null,
- clerkTrainingStoreId: null,
defaultStoreId: null,
};
@@ -13,14 +12,12 @@ const RecordIds = {
if (env === 'dev') {
RecordIds.testCustomerId = 'recimV9zs2StWB2Mj';
RecordIds.guestCustomerId = 'recLKK7cZHboMPEB8';
- RecordIds.clerkTrainingStoreId = 'reck65q6wsvyQvnLf';
RecordIds.defaultStoreId = 'recKmetaavnMWXVrk';
// IDs from PROD base
} else if (env === 'prod') {
RecordIds.testCustomerId = 'recomWMtzSUQCcIvr';
RecordIds.guestCustomerId = 'recxEGfvExP4Dv8nr';
- RecordIds.clerkTrainingStoreId = 'recq6630DixVw63un';
RecordIds.defaultStoreId = 'recQmf64hlp9CyBas';
}
diff --git a/lib/airtable/airtable.js b/lib/airtable/airtable.js
index d1b8117c..98ece017 100644
--- a/lib/airtable/airtable.js
+++ b/lib/airtable/airtable.js
@@ -194,6 +194,9 @@ function deleteRecord(table, id) {
}
export {
+ base,
+ fromAirtableFormat,
+ toAirtableFormat,
createRecord,
getAllRecords,
getRecordById,
diff --git a/lib/airtable/request.js b/lib/airtable/request.js
index 3ffc3933..9c5ae444 100644
--- a/lib/airtable/request.js
+++ b/lib/airtable/request.js
@@ -12,15 +12,15 @@
*/
-import { Tables, Columns } from './schema';
import {
createRecord,
- updateRecord,
+ deleteRecord,
getAllRecords,
- getRecordsByAttribute,
getRecordById,
- deleteRecord,
+ getRecordsByAttribute,
+ updateRecord,
} from './airtable';
+import { Columns, Tables } from './schema';
/*
******* CREATE RECORDS *******
@@ -30,10 +30,6 @@ export const createCustomers = async (record) => {
return createRecord(Tables.Customers, record);
};
-export const createPushTokens = async (record) => {
- return createRecord(Tables.PushTokens, record);
-};
-
export const createClerks = async (record) => {
return createRecord(Tables.Clerks, record);
};
@@ -46,28 +42,28 @@ export const createProducts = async (record) => {
return createRecord(Tables.Products, record);
};
-export const createLineItems = async (record) => {
- return createRecord(Tables.LineItems, record);
+export const createResources = async (record) => {
+ return createRecord(Tables.Resources, record);
};
export const createTransactions = async (record) => {
return createRecord(Tables.Transactions, record);
};
-export const createRecipes = async (record) => {
- return createRecord(Tables.Recipes, record);
+export const createLineItems = async (record) => {
+ return createRecord(Tables.LineItems, record);
};
-export const createResources = async (record) => {
- return createRecord(Tables.Resources, record);
+export const createPushTokens = async (record) => {
+ return createRecord(Tables.PushTokens, record);
};
export const createNews = async (record) => {
return createRecord(Tables.News, record);
};
-export const createReceipts = async (record) => {
- return createRecord(Tables.Receipts, record);
+export const createRecipes = async (record) => {
+ return createRecord(Tables.Recipes, record);
};
/*
@@ -99,22 +95,6 @@ export const getCustomersByPhoneNumber = async (value, sort = []) => {
);
};
-export const getPushTokensById = async (id) => {
- return getRecordById(Tables.PushTokens, id);
-};
-
-export const getPushTokensByIds = async (ids) => {
- const formula = `OR(${ids.reduce(
- (f, id) => `${f} {ID}='${id}',`,
- ''
- )} 1 < 0)`;
- return getAllRecords(Tables.PushTokens, formula);
-};
-
-export const getAllPushTokens = async (filterByFormula = '', sort = []) => {
- return getAllRecords(Tables.PushTokens, filterByFormula, sort);
-};
-
export const getClerksById = async (id) => {
return getRecordById(Tables.Clerks, id);
};
@@ -163,20 +143,20 @@ export const getAllProducts = async (filterByFormula = '', sort = []) => {
return getAllRecords(Tables.Products, filterByFormula, sort);
};
-export const getLineItemsById = async (id) => {
- return getRecordById(Tables.LineItems, id);
+export const getResourcesById = async (id) => {
+ return getRecordById(Tables.Resources, id);
};
-export const getLineItemsByIds = async (ids) => {
+export const getResourcesByIds = async (ids) => {
const formula = `OR(${ids.reduce(
(f, id) => `${f} {ID}='${id}',`,
''
)} 1 < 0)`;
- return getAllRecords(Tables.LineItems, formula);
+ return getAllRecords(Tables.Resources, formula);
};
-export const getAllLineItems = async (filterByFormula = '', sort = []) => {
- return getAllRecords(Tables.LineItems, filterByFormula, sort);
+export const getAllResources = async (filterByFormula = '', sort = []) => {
+ return getAllRecords(Tables.Resources, filterByFormula, sort);
};
export const getTransactionsById = async (id) => {
@@ -195,36 +175,36 @@ export const getAllTransactions = async (filterByFormula = '', sort = []) => {
return getAllRecords(Tables.Transactions, filterByFormula, sort);
};
-export const getRecipesById = async (id) => {
- return getRecordById(Tables.Recipes, id);
+export const getLineItemsById = async (id) => {
+ return getRecordById(Tables.LineItems, id);
};
-export const getRecipesByIds = async (ids) => {
+export const getLineItemsByIds = async (ids) => {
const formula = `OR(${ids.reduce(
(f, id) => `${f} {ID}='${id}',`,
''
)} 1 < 0)`;
- return getAllRecords(Tables.Recipes, formula);
+ return getAllRecords(Tables.LineItems, formula);
};
-export const getAllRecipes = async (filterByFormula = '', sort = []) => {
- return getAllRecords(Tables.Recipes, filterByFormula, sort);
+export const getAllLineItems = async (filterByFormula = '', sort = []) => {
+ return getAllRecords(Tables.LineItems, filterByFormula, sort);
};
-export const getResourcesById = async (id) => {
- return getRecordById(Tables.Resources, id);
+export const getPushTokensById = async (id) => {
+ return getRecordById(Tables.PushTokens, id);
};
-export const getResourcesByIds = async (ids) => {
+export const getPushTokensByIds = async (ids) => {
const formula = `OR(${ids.reduce(
(f, id) => `${f} {ID}='${id}',`,
''
)} 1 < 0)`;
- return getAllRecords(Tables.Resources, formula);
+ return getAllRecords(Tables.PushTokens, formula);
};
-export const getAllResources = async (filterByFormula = '', sort = []) => {
- return getAllRecords(Tables.Resources, filterByFormula, sort);
+export const getAllPushTokens = async (filterByFormula = '', sort = []) => {
+ return getAllRecords(Tables.PushTokens, filterByFormula, sort);
};
export const getNewsById = async (id) => {
@@ -243,20 +223,20 @@ export const getAllNews = async (filterByFormula = '', sort = []) => {
return getAllRecords(Tables.News, filterByFormula, sort);
};
-export const getReceiptsById = async (id) => {
- return getRecordById(Tables.Receipts, id);
+export const getRecipesById = async (id) => {
+ return getRecordById(Tables.Recipes, id);
};
-export const getReceiptsByIds = async (ids) => {
+export const getRecipesByIds = async (ids) => {
const formula = `OR(${ids.reduce(
(f, id) => `${f} {ID}='${id}',`,
''
)} 1 < 0)`;
- return getAllRecords(Tables.Receipts, formula);
+ return getAllRecords(Tables.Recipes, formula);
};
-export const getAllReceipts = async (filterByFormula = '', sort = []) => {
- return getAllRecords(Tables.Receipts, filterByFormula, sort);
+export const getAllRecipes = async (filterByFormula = '', sort = []) => {
+ return getAllRecords(Tables.Recipes, filterByFormula, sort);
};
/*
@@ -267,10 +247,6 @@ export const updateCustomers = async (id, recordUpdates) => {
return updateRecord(Tables.Customers, id, recordUpdates);
};
-export const updatePushTokens = async (id, recordUpdates) => {
- return updateRecord(Tables.PushTokens, id, recordUpdates);
-};
-
export const updateClerks = async (id, recordUpdates) => {
return updateRecord(Tables.Clerks, id, recordUpdates);
};
@@ -283,28 +259,28 @@ export const updateProducts = async (id, recordUpdates) => {
return updateRecord(Tables.Products, id, recordUpdates);
};
-export const updateLineItems = async (id, recordUpdates) => {
- return updateRecord(Tables.LineItems, id, recordUpdates);
+export const updateResources = async (id, recordUpdates) => {
+ return updateRecord(Tables.Resources, id, recordUpdates);
};
export const updateTransactions = async (id, recordUpdates) => {
return updateRecord(Tables.Transactions, id, recordUpdates);
};
-export const updateRecipes = async (id, recordUpdates) => {
- return updateRecord(Tables.Recipes, id, recordUpdates);
+export const updateLineItems = async (id, recordUpdates) => {
+ return updateRecord(Tables.LineItems, id, recordUpdates);
};
-export const updateResources = async (id, recordUpdates) => {
- return updateRecord(Tables.Resources, id, recordUpdates);
+export const updatePushTokens = async (id, recordUpdates) => {
+ return updateRecord(Tables.PushTokens, id, recordUpdates);
};
export const updateNews = async (id, recordUpdates) => {
return updateRecord(Tables.News, id, recordUpdates);
};
-export const updateReceipts = async (id, recordUpdates) => {
- return updateRecord(Tables.Receipts, id, recordUpdates);
+export const updateRecipes = async (id, recordUpdates) => {
+ return updateRecord(Tables.Recipes, id, recordUpdates);
};
/*
@@ -314,9 +290,6 @@ export const updateReceipts = async (id, recordUpdates) => {
export const deleteCustomers = async (id) => {
return deleteRecord(Tables.Customers, id);
};
-export const deletePushTokens = async (id) => {
- return deleteRecord(Tables.PushTokens, id);
-};
export const deleteClerks = async (id) => {
return deleteRecord(Tables.Clerks, id);
};
@@ -326,21 +299,21 @@ export const deleteStores = async (id) => {
export const deleteProducts = async (id) => {
return deleteRecord(Tables.Products, id);
};
-export const deleteLineItems = async (id) => {
- return deleteRecord(Tables.LineItems, id);
+export const deleteResources = async (id) => {
+ return deleteRecord(Tables.Resources, id);
};
export const deleteTransactions = async (id) => {
return deleteRecord(Tables.Transactions, id);
};
-export const deleteRecipes = async (id) => {
- return deleteRecord(Tables.Recipes, id);
+export const deleteLineItems = async (id) => {
+ return deleteRecord(Tables.LineItems, id);
};
-export const deleteResources = async (id) => {
- return deleteRecord(Tables.Resources, id);
+export const deletePushTokens = async (id) => {
+ return deleteRecord(Tables.PushTokens, id);
};
export const deleteNews = async (id) => {
return deleteRecord(Tables.News, id);
};
-export const deleteReceipts = async (id) => {
- return deleteRecord(Tables.Receipts, id);
+export const deleteRecipes = async (id) => {
+ return deleteRecord(Tables.Recipes, id);
};
diff --git a/lib/airtable/schema.js b/lib/airtable/schema.js
index 4f53b72f..b8665c82 100644
--- a/lib/airtable/schema.js
+++ b/lib/airtable/schema.js
@@ -5,16 +5,15 @@
export const Tables = {
Customers: 'Customers',
- PushTokens: 'Push Tokens',
Clerks: 'Clerks',
Stores: 'Stores',
Products: 'Products',
- LineItems: 'Line Items',
- Transactions: 'Transactions',
- Recipes: 'Recipes',
Resources: 'Resources',
+ Transactions: 'Transactions',
+ LineItems: 'Line Items',
+ PushTokens: 'Push Tokens',
News: 'News',
- Receipts: 'Receipts',
+ Recipes: 'Recipes',
};
export const Columns = {
@@ -25,20 +24,12 @@ export const Columns = {
points: { name: `Points`, type: `number` },
rewardsAvailable: { name: `Rewards Available`, type: `formula` },
transactionIds: { name: `Transactions`, type: `foreignKey-many` },
- receiptIds: { name: `Receipts`, type: `foreignKey-many` },
pushTokenIds: { name: `Push Tokens`, type: `foreignKey-many` },
rewardsRedeemed: { name: `Rewards Redeemed`, type: `number` },
id: { name: `id`, type: `formula` },
name: { name: `Name`, type: `text` },
tokenNames: { name: `Token Names`, type: `lookup` },
- },
- 'Push Tokens': {
- primaryKey: { name: `Primary Key`, type: `formula` },
- created: { name: `Created`, type: `formula` },
- customerIds: { name: `Customers`, type: `foreignKey-many` },
- customerName: { name: `Customer Name`, type: `lookup` },
- token: { name: `Token`, type: `text` },
- id: { name: `id`, type: `formula` },
+ favoriteStoreIds: { name: `Favorite Stores`, type: `foreignKey-many` },
},
Clerks: {
primaryKey: { name: `Primary Key`, type: `formula` },
@@ -68,10 +59,17 @@ export const Columns = {
rewardsAccepted: { name: `Rewards Accepted`, type: `checkbox` },
phoneNumber: { name: `Phone Number`, type: `phone` },
wic: { name: `WIC`, type: `checkbox` },
+ doNotDisplay: { name: `Do Not Display`, type: `checkbox` },
+ stocksOtherVendors: { name: `Stocks Other Vendors`, type: `checkbox` },
+ favoritedCustomerIds: {
+ name: `Favorited Customers`,
+ type: `foreignKey-many`,
+ },
},
Products: {
primaryKey: { name: `Primary Key`, type: `formula` },
category: { name: `Category`, type: `multiSelect` },
+ customerCost: { name: `Customer Cost`, type: `number` },
points: { name: `Points`, type: `formula` },
multiplier: { name: `Multiplier`, type: `number` },
id: { name: `id`, type: `formula` },
@@ -82,16 +80,13 @@ export const Columns = {
detail: { name: `Detail`, type: `text` },
fullName: { name: `Full Name`, type: `formula` },
fullSizeImage: { name: `Full Size Image`, type: `multipleAttachment` },
- customerCost: { name: `Customer Cost`, type: `number` },
},
- 'Line Items': {
+ Resources: {
primaryKey: { name: `Primary Key`, type: `formula` },
- productId: { name: `Product`, type: `foreignKey-one` },
- quantity: { name: `Quantity`, type: `number` },
- totalPrice: { name: `Total price`, type: `formula` },
- productPrice: { name: `Product price`, type: `lookup` },
- transactionId: { name: `Transaction`, type: `foreignKey-one` },
- productFullName: { name: `Product Full Name`, type: `lookup` },
+ url: { name: `URL`, type: `text` },
+ description: { name: `Description`, type: `text` },
+ category: { name: `Category`, type: `select` },
+ title: { name: `Title`, type: `text` },
id: { name: `id`, type: `formula` },
},
Transactions: {
@@ -102,7 +97,7 @@ export const Columns = {
type: `foreignKey-many`,
},
customerId: { name: `Customer`, type: `foreignKey-one` },
- receiptIds: { name: `Receipts`, type: `foreignKey-many` },
+ receipts: { name: `Receipts`, type: `text` },
date: { name: `Date`, type: `formula` },
pointsEarned: { name: `Points Earned`, type: `number` },
clerkId: { name: `Clerk`, type: `foreignKey-one` },
@@ -116,22 +111,22 @@ export const Columns = {
discount: { name: `Discount`, type: `number` },
subtotal: { name: `Subtotal`, type: `number` },
},
- Recipes: {
+ 'Line Items': {
primaryKey: { name: `Primary Key`, type: `formula` },
- servings: { name: `Servings`, type: `text` },
- prepTimeminutes: { name: `Prep Time (minutes)`, type: `text` },
- cookTimeminutes: { name: `Cook Time (minutes)`, type: `text` },
- ingredients: { name: `Ingredients`, type: `text` },
- instructions: { name: `Instructions`, type: `text` },
- title: { name: `Title`, type: `text` },
+ productId: { name: `Product`, type: `foreignKey-one` },
+ quantity: { name: `Quantity`, type: `number` },
+ totalPrice: { name: `Total price`, type: `formula` },
+ productPrice: { name: `Product price`, type: `lookup` },
+ transactionId: { name: `Transaction`, type: `foreignKey-one` },
+ productFullName: { name: `Product Full Name`, type: `lookup` },
id: { name: `id`, type: `formula` },
},
- Resources: {
+ 'Push Tokens': {
primaryKey: { name: `Primary Key`, type: `formula` },
- url: { name: `URL`, type: `multilineText` },
- description: { name: `Description`, type: `text` },
- category: { name: `Category`, type: `select` },
- title: { name: `Title`, type: `text` },
+ created: { name: `Created`, type: `formula` },
+ customerIds: { name: `Customers`, type: `foreignKey-many` },
+ customerName: { name: `Customer Name`, type: `lookup` },
+ token: { name: `Token`, type: `text` },
id: { name: `id`, type: `formula` },
},
News: {
@@ -142,13 +137,14 @@ export const Columns = {
postDate: { name: `Post Date`, type: `date` },
title: { name: `Title`, type: `text` },
},
- Receipts: {
+ Recipes: {
primaryKey: { name: `Primary Key`, type: `formula` },
- transactionId: { name: `Transaction`, type: `foreignKey-one` },
- attachments: { name: `Attachments`, type: `multipleAttachment` },
- time: { name: `Time`, type: `date` },
- customerId: { name: `Customer`, type: `foreignKey-one` },
- customerName: { name: `Customer Name`, type: `lookup` },
+ servings: { name: `Servings`, type: `text` },
+ prepTimeminutes: { name: `Prep Time (Minutes)`, type: `text` },
+ cookTimeminutes: { name: `Cook Time (Minutes)`, type: `text` },
+ ingredients: { name: `Ingredients`, type: `multilineText` },
+ instructions: { name: `Instructions`, type: `multilineText` },
+ title: { name: `Title`, type: `text` },
id: { name: `id`, type: `formula` },
},
};
diff --git a/lib/mapUtils.js b/lib/mapUtils.js
index 4841cc2a..73101432 100644
--- a/lib/mapUtils.js
+++ b/lib/mapUtils.js
@@ -7,7 +7,6 @@ import {
today,
} from '../constants/DaysOfTheWeek';
import { googlePlaceId } from '../constants/Map';
-import RecordIds from '../constants/RecordIds';
import { getAllStores, getProductsByIds } from './airtable/request';
import { formatPhoneNumber } from './authUtils';
import { logErrorToSentry } from './logUtils';
@@ -248,9 +247,9 @@ function updateProductData(record) {
// Returns a promise that resolves to an array of Store objects
export async function getStoreData(filterByFormula = '') {
const records = await getAllStores(filterByFormula);
- // Filter out the Clerk Training store
+ // Filter out stores marked as Do Not Display
const stores = records
- .filter((record) => record.id !== RecordIds.clerkTrainingStoreId)
+ .filter((record) => record.id && !record.doNotDisplay)
.map(updateStoreData);
return stores;
}
diff --git a/package.json b/package.json
index 3751f7e1..9d2bf243 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,8 @@
"expo-haptics": "~8.1.0",
"expo-location": "~8.1.0",
"expo-permissions": "~8.1.0",
- "expo-web-browser": "~8.1.0",
+ "expo-status-bar": "^1.0.0",
+ "expo-web-browser": "~8.2.0",
"firebase": "7.9.0",
"geolib": "^3.1.0",
"global": "^4.4.0",
diff --git a/screens/map/StoreListScreen.js b/screens/map/StoreListScreen.js
index 6d3e0c50..490f3729 100644
--- a/screens/map/StoreListScreen.js
+++ b/screens/map/StoreListScreen.js
@@ -7,7 +7,7 @@ import {
Body,
ButtonLabel,
NavHeaderContainer,
- Title,
+ Title
} from '../../components/BaseComponents';
import ProgramTag from '../../components/store/ProgramTag';
import StoreCard from '../../components/store/StoreCard';
@@ -139,7 +139,7 @@ export default class StoreListScreen extends React.Component {
}}
/>
{
diff --git a/screens/settings/SettingsScreen.js b/screens/settings/SettingsScreen.js
index 9a51b95c..49fb7291 100644
--- a/screens/settings/SettingsScreen.js
+++ b/screens/settings/SettingsScreen.js
@@ -1,6 +1,7 @@
import { FontAwesome5 } from '@expo/vector-icons';
import { Updates } from 'expo';
import Constants from 'expo-constants';
+import * as WebBrowser from 'expo-web-browser';
import PropTypes from 'prop-types';
import React from 'react';
import {
@@ -135,7 +136,7 @@ export default class SettingsScreen extends React.Component {
- Linking.openURL(
+ WebBrowser.openBrowserAsync(
'https://healthycorners-rewards.netlify.app/shared/privacypolicy.html'
)
}
diff --git a/yarn.lock b/yarn.lock
index b5da60e6..ba51faec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7738,10 +7738,10 @@ expo-sqlite@~8.1.0:
"@types/websql" "^0.0.27"
lodash "^4.17.15"
-expo-web-browser@~8.1.0:
- version "8.1.1"
- resolved "https://registry.yarnpkg.com/expo-web-browser/-/expo-web-browser-8.1.1.tgz#93a3d4af834e7bbd1afd54f0cc588016d592c5ae"
- integrity sha512-htiXVLo0mb0t8F2vFL3+QnmD97B9U0Ek9cp2BBKSCLeHaVry6RUMewT9HLLcBOJhz2Zdjwk7JmTJh6amF1h80Q==
+expo-status-bar@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/expo-status-bar/-/expo-status-bar-1.0.0.tgz#06b54974c0aef9bb614fd497c7fbc397e5cd8072"
+ integrity sha512-WxFqFk0AlPcfKFwJxYboUvo4D+WWyeGKU2XeIq3eMC6+IN4esBMvQ6VaR3u3oJCkOcjWyS7WPCeCLeCRZnwmmg==
expo-web-browser@~8.2.0:
version "8.2.1"