Przeglądaj źródła

Removes hardcoded defaulting to US number from the code.

master
damencho 6 lat temu
rodzic
commit
384f0d4317
1 zmienionych plików z 2 dodań i 16 usunięć
  1. 2
    16
      react/features/invite/functions.js

+ 2
- 16
react/features/invite/functions.js Wyświetl plik

@@ -518,18 +518,12 @@ export function getDialInfoPageURL(
518 518
  */
519 519
 export function _getDefaultPhoneNumber(
520 520
         dialInNumbers: Object): ?string {
521
-    const defValueForDefaultCountry = 'US';
522 521
 
523 522
     if (Array.isArray(dialInNumbers)) {
524 523
         // new syntax follows
525 524
         // find the default country inside dialInNumbers, US one
526 525
         // or return the first one
527
-        let defaultNumber = dialInNumbers.find(number => number.default);
528
-
529
-        if (!defaultNumber) {
530
-            defaultNumber = dialInNumbers.find(({ countryCode }) =>
531
-                countryCode === defValueForDefaultCountry);
532
-        }
526
+        const defaultNumber = dialInNumbers.find(number => number.default);
533 527
 
534 528
         if (defaultNumber) {
535 529
             return defaultNumber.formattedNumber;
@@ -539,18 +533,10 @@ export function _getDefaultPhoneNumber(
539 533
             ? dialInNumbers[0].formattedNumber : null;
540 534
     }
541 535
 
542
-    const {
543
-        defaultCountry = defValueForDefaultCountry,
544
-        numbers } = dialInNumbers;
536
+    const { numbers } = dialInNumbers;
545 537
 
546 538
     if (numbers && Object.keys(numbers).length > 0) {
547 539
         // deprecated and will be removed
548
-        const defaultNumbers = numbers[defaultCountry];
549
-
550
-        if (defaultNumbers) {
551
-            return defaultNumbers[0];
552
-        }
553
-
554 540
         const firstRegion = Object.keys(numbers)[0];
555 541
 
556 542
         return firstRegion && numbers[firstRegion][0];

Ładowanie…
Anuluj
Zapisz