Skip to content

Commit c20a3f7

Browse files
committed
Merge remote-tracking branch 'origin' into Feature/TriggerProfilePageEvent
2 parents 6254907 + 9f022b2 commit c20a3f7

File tree

5 files changed

+70
-333
lines changed

5 files changed

+70
-333
lines changed

dotenv.sample.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
REACT_APP_STAGE=dev
12
PORT=3101
23

34
#Update values and rename to .env. For local development you may keep these values.

package-lock.json

Lines changed: 36 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
"private": true,
55
"type": "module",
66
"dependencies": {
7-
"@churchapps/apphelper": "^0.4.50",
8-
"@churchapps/apphelper-donations": "^0.4.50",
9-
"@churchapps/apphelper-forms": "^0.4.50",
10-
"@churchapps/apphelper-login": "^0.4.50",
11-
"@churchapps/apphelper-markdown": "^0.4.50",
12-
"@churchapps/helpers": "^1.1.8",
7+
"@churchapps/apphelper": "^0.5.0",
8+
"@churchapps/apphelper-donations": "^0.5.0",
9+
"@churchapps/apphelper-forms": "^0.5.0",
10+
"@churchapps/apphelper-login": "^0.5.0",
11+
"@churchapps/apphelper-markdown": "^0.5.0",
12+
"@churchapps/helpers": "^1.2.3",
1313
"@mui/icons-material": "^7.1.2",
1414
"@mui/material": "^7.1.2",
1515
"@stripe/react-stripe-js": "^3.8.0",

src/profile/components/PairScreen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const PairScreen = (props: Props) => {
2929

3030
const handleSave = () => {
3131
if (validate()) {
32-
ApiHelper.get("/devices/pair/" + code, "MembershipAPi").then((data) => {
32+
ApiHelper.get("/devices/pair/" + code, "MessagingApi").then((data) => {
3333
if (data.success) props.updatedFunction();
3434
else setErrors(["Invalid pairing code."]);
3535
});

0 commit comments

Comments
 (0)