fix: Update handling of twilio sendgrid config

211-Connect · Oct 7, 2024 · 0160d18 · 0160d18
1 parent 8736782
commit 0160d18
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/bin/createAppFromStrapi.js b/bin/createAppFromStrapi.js
@@ -35,6 +35,7 @@ const query = qs.stringify({
  'dataProviders',
  'dataProviders.logo',
  'radiusSelectValues',
+ 'sms',
  'localizations',
  'localizations.logo',
  'localizations.favicon',
@@ -138,7 +139,7 @@ module.exports = function createFromStrapi(dir) {
  zoom: 7,
  },
  alert: appConfig?.alert,
- theme: appConfig?.theme ?? null,
+ theme: appConfig?.theme,
  hideAttribution: appConfig?.hideAttribution ?? true,
  pages: {},
  menus: {
@@ -152,6 +153,7 @@ module.exports = function createFromStrapi(dir) {
  },
  categories: [],
  suggestions: [],
+ sms: appConfig?.sms,
  };
 
  translationFile['en']['search.hero_title'] = appConfig.search.homePageTitle;

diff --git a/src/shared/components/share-button.tsx b/src/shared/components/share-button.tsx
@@ -34,11 +34,12 @@ export function ShareButton({ componentToPrintRef, title, body }) {
  content: () => componentToPrintRef.current,
  });
  const [shortUrl, setShortUrl] = useState('');
- const appConfig = useAppConfig();
 
  useEffect(() => {
  async function getShortUrl() {
- const { url } = await ShortUrlService.getOrCreateShortUrl(window.location.href);
+ const { url } = await ShortUrlService.getOrCreateShortUrl(
+ window.location.href,
+ );
  setShortUrl(url);
  }
 

diff --git a/src/shared/components/sms-button.tsx b/src/shared/components/sms-button.tsx
@@ -38,7 +38,7 @@ export function SmsButton({ title, body, shortUrl }) {
  };
 
  const handleClick = () => {
- if (!('sms' in appConfig.features)) {
+ if (!('sms' in appConfig)) {
  const { userAgent } = navigator;
  const isIOS = /iPhone|iPad|iPod|Macintosh/i.test(userAgent);
  let smsLink = '';

diff --git a/src/shared/context/app-config-context.ts b/src/shared/context/app-config-context.ts
@@ -58,8 +58,8 @@ type AppConfig = {
  href?: string;
  logo?: string;
  }[];
- features?: {
- sms: any;
+ sms?: {
+ provider: 'Twilio';
  }[];
 };