diff --git a/.gitignore b/.gitignore index e935ebe..d086a64 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ envs/server /.pnp .pnp.js +/envs/server # testing /coverage diff --git a/envs/client/.dev.server.env b/envs/client/.dev.server.env deleted file mode 100644 index ef196c2..0000000 --- a/envs/client/.dev.server.env +++ /dev/null @@ -1 +0,0 @@ -REACT_APP_API_END_POINT = http://localhost:8888/dev \ No newline at end of file diff --git a/envs/client/.prod.mock-server.env b/envs/client/.prod.mock-server.env deleted file mode 100644 index 418c6a7..0000000 --- a/envs/client/.prod.mock-server.env +++ /dev/null @@ -1,3 +0,0 @@ - -REACT_APP_ENABLE_MOCKS= true -STORYBOOK_ENABLE_MOCKS= true \ No newline at end of file diff --git a/envs/client/dev-server.env b/envs/client/dev-server.env new file mode 100644 index 0000000..08c47f2 --- /dev/null +++ b/envs/client/dev-server.env @@ -0,0 +1,2 @@ + +REACT_APP_API_END_POINT = http://localhost:8888/dev \ No newline at end of file diff --git a/envs/client/.dev.mock-server.env b/envs/client/mock-server.env similarity index 100% rename from envs/client/.dev.mock-server.env rename to envs/client/mock-server.env diff --git a/envs/client/preview-server.env b/envs/client/preview-server.env new file mode 100644 index 0000000..56ed718 --- /dev/null +++ b/envs/client/preview-server.env @@ -0,0 +1,2 @@ + +REACT_APP_API_END_POINT = https://makers-bolt-fun-preview.netlify.app/.netlify/functions \ No newline at end of file diff --git a/envs/client/.dev.prod-server.env b/envs/client/prod-server.env similarity index 100% rename from envs/client/.dev.prod-server.env rename to envs/client/prod-server.env diff --git a/package.json b/package.json index dd0041d..88f84a0 100644 --- a/package.json +++ b/package.json @@ -90,20 +90,20 @@ "yup": "^0.32.11" }, "scripts": { - "client:prod-server": "env-cmd -f ./envs/client/.dev.prod-server.env react-scripts start", - "client:preview-server": "env-cmd -f ./envs/client/.dev.preview-server.env react-scripts start", - "client:mocks": "env-cmd -f ./envs/client/.dev.mock-server.env react-scripts start", - "client:dev-server": "env-cmd -f ./envs/client/.dev.server.env react-scripts start", + "client:dev-server": "env-cmd -f ./envs/client/dev-server.env react-scripts start", "server:dev": "env-cmd -f ./envs/server/local.env serverless offline", + "client:preview-server": "env-cmd -f ./envs/client/preview-server.env react-scripts start", "server:preview": "env-cmd -f ./envs/server/preview.env serverless offline", + "client:prod-server": "env-cmd -f ./envs/client/prod-server.env react-scripts start", "server:prod": "env-cmd -f ./envs/server/prod.env serverless offline", + "client:mocks": "env-cmd -f ./envs/client/.mock-server.env react-scripts start", "generate-graphql": "graphql-codegen", "storybook": "env-cmd -f ./envs/client/.dev.preview-server.env start-storybook -p 6006 -s public", "storybook:mocks": "env-cmd -f ./envs/client/.dev.mock-server.env start-storybook -p 6006 -s public", "build": "react-scripts build", - "build:mocks": "env-cmd -f ./envs/client/.prod.mock-server.env react-scripts build", - "build-storybook": "env-cmd -f ./envs/client/.dev.preview-server.env build-storybook -s public", - "build-storybook:mocks": "env-cmd -f ./envs/client/.prod.mock-server.env build-storybook -s public", + "build:mocks": "env-cmd -f ./envs/client/mock-server.env react-scripts build", + "build-storybook": "env-cmd -f ./envs/client/preview-server.env build-storybook -s public", + "build-storybook:mocks": "env-cmd -f ./envs/client/mock-server.env build-storybook -s public", "test": "react-scripts test", "eject": "react-scripts eject", "db:migrate-dev": "prisma migrate dev", diff --git a/src/features/Profiles/pages/EditProfilePage/PreferencesTab/LinkingAccountModal/LinkingAccountModal.tsx b/src/features/Profiles/pages/EditProfilePage/PreferencesTab/LinkingAccountModal/LinkingAccountModal.tsx index bfeb522..e4bc49f 100644 --- a/src/features/Profiles/pages/EditProfilePage/PreferencesTab/LinkingAccountModal/LinkingAccountModal.tsx +++ b/src/features/Profiles/pages/EditProfilePage/PreferencesTab/LinkingAccountModal/LinkingAccountModal.tsx @@ -96,19 +96,20 @@ export default function LinkingAccountModal({ onClose, direction, ...props }: Mo

Fetching Lnurl-Auth Link...

- else + else { content =
@@ -132,7 +133,7 @@ export default function LinkingAccountModal({ onClose, direction, ...props }: Mo
- + } return (