makerspace-react-rails 0.10.7 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5ca384d29fbdb0783bc255732bd759b139e5b0678c2c8e2847cced3617c8289
-  data.tar.gz: 7305553078d756cfdf853a582bbe80974c50124c69eef910f1393f31262b7096
+  metadata.gz: faaae83371517a9a1b5712f4c4a1c0be90857139145f4592e8cb162f299ebfd1
+  data.tar.gz: 6f23abbedf818d3ba649a783cc19558ec6d99e6b99ea490dfff5f6ea7d3c3c91
 SHA512:
-  metadata.gz: 6a184c9630d53617f179ef18369def9bb7e2adbbebba71cacab9c578a48a10b4d3fd52281ed67f28a4f7814530f1ea47eef4b055f0d50ef47a84d5ea191c84a3
-  data.tar.gz: 69f71341ba581addc505e5a1e5331b0223c25584efddc8e753613a8c69d5cb7f17afaa794c2a48c3d3fbd96abf4201dbcb77835257ac4db479481869eb3c3c5d
+  metadata.gz: 86e18e3c3cb7633c5aac983ca8f4a2ef0c664243bd0a3cbdf19de7c822ce648605691ed4432449eb98683781c7520243987870f2cb78b1d2086db9b6b1da54fa
+  data.tar.gz: e57f93833ab3d170d03e1dedf26b1a8d07b95d332bbb5729ce83afccbf89744a524eabdcef86224ea634fc1a812957f3c4f9036ca186b289adc9667de9622463

data/lib/makerspace/react/rails/version.rb

@@ -1,7 +1,7 @@
 module Makerspace
   module React
     module Rails
-      VERSION = "0.10.7"
+      VERSION = "0.14.0"
     end
   end
 end

data/vendor/assets/javascripts/makerspace-react.js

@@ -37704,6 +37704,38 @@ exports.default = _default;
 
 /***/ }),
 
+/***/ "./node_modules/@material-ui/icons/Error.js":
+/*!**************************************************!*\
+  !*** ./node_modules/@material-ui/icons/Error.js ***!
+  \**************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ "./node_modules/@babel/runtime/helpers/interopRequireDefault.js");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(__webpack_require__(/*! react */ "./node_modules/react/index.js"));
+
+var _createSvgIcon = _interopRequireDefault(__webpack_require__(/*! ./utils/createSvgIcon */ "./node_modules/@material-ui/icons/utils/createSvgIcon.js"));
+
+var _default = (0, _createSvgIcon.default)(_react.default.createElement(_react.default.Fragment, null, _react.default.createElement("path", {
+  fill: "none",
+  d: "M0 0h24v24H0z"
+}), _react.default.createElement("path", {
+  d: "M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-2h2v2zm0-4h-2V7h2v6z"
+})), 'Error');
+
+exports.default = _default;
+
+/***/ }),
+
 /***/ "./node_modules/@material-ui/icons/FilterList.js":
 /*!*******************************************************!*\
   !*** ./node_modules/@material-ui/icons/FilterList.js ***!
@@ -102795,6 +102827,876 @@ var zipWith = Object(_baseRest_js__WEBPACK_IMPORTED_MODULE_0__["default"])(funct
 /* harmony default export */ __webpack_exports__["default"] = (zipWith);
 
 
+/***/ }),
+
+/***/ "./node_modules/lodash/_Symbol.js":
+/*!****************************************!*\
+  !*** ./node_modules/lodash/_Symbol.js ***!
+  \****************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+var root = __webpack_require__(/*! ./_root */ "./node_modules/lodash/_root.js");
+
+/** Built-in value references. */
+var Symbol = root.Symbol;
+
+module.exports = Symbol;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/_arrayMap.js":
+/*!******************************************!*\
+  !*** ./node_modules/lodash/_arrayMap.js ***!
+  \******************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+/**
+ * A specialized version of `_.map` for arrays without support for iteratee
+ * shorthands.
+ *
+ * @private
+ * @param {Array} [array] The array to iterate over.
+ * @param {Function} iteratee The function invoked per iteration.
+ * @returns {Array} Returns the new mapped array.
+ */
+function arrayMap(array, iteratee) {
+  var index = -1,
+      length = array == null ? 0 : array.length,
+      result = Array(length);
+
+  while (++index < length) {
+    result[index] = iteratee(array[index], index, array);
+  }
+  return result;
+}
+
+module.exports = arrayMap;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/_arrayReduce.js":
+/*!*********************************************!*\
+  !*** ./node_modules/lodash/_arrayReduce.js ***!
+  \*********************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+/**
+ * A specialized version of `_.reduce` for arrays without support for
+ * iteratee shorthands.
+ *
+ * @private
+ * @param {Array} [array] The array to iterate over.
+ * @param {Function} iteratee The function invoked per iteration.
+ * @param {*} [accumulator] The initial value.
+ * @param {boolean} [initAccum] Specify using the first element of `array` as
+ *  the initial value.
+ * @returns {*} Returns the accumulated value.
+ */
+function arrayReduce(array, iteratee, accumulator, initAccum) {
+  var index = -1,
+      length = array == null ? 0 : array.length;
+
+  if (initAccum && length) {
+    accumulator = array[++index];
+  }
+  while (++index < length) {
+    accumulator = iteratee(accumulator, array[index], index, array);
+  }
+  return accumulator;
+}
+
+module.exports = arrayReduce;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/_asciiWords.js":
+/*!********************************************!*\
+  !*** ./node_modules/lodash/_asciiWords.js ***!
+  \********************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+/** Used to match words composed of alphanumeric characters. */
+var reAsciiWord = /[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;
+
+/**
+ * Splits an ASCII `string` into an array of its words.
+ *
+ * @private
+ * @param {string} The string to inspect.
+ * @returns {Array} Returns the words of `string`.
+ */
+function asciiWords(string) {
+  return string.match(reAsciiWord) || [];
+}
+
+module.exports = asciiWords;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/_baseGetTag.js":
+/*!********************************************!*\
+  !*** ./node_modules/lodash/_baseGetTag.js ***!
+  \********************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+var Symbol = __webpack_require__(/*! ./_Symbol */ "./node_modules/lodash/_Symbol.js"),
+    getRawTag = __webpack_require__(/*! ./_getRawTag */ "./node_modules/lodash/_getRawTag.js"),
+    objectToString = __webpack_require__(/*! ./_objectToString */ "./node_modules/lodash/_objectToString.js");
+
+/** `Object#toString` result references. */
+var nullTag = '[object Null]',
+    undefinedTag = '[object Undefined]';
+
+/** Built-in value references. */
+var symToStringTag = Symbol ? Symbol.toStringTag : undefined;
+
+/**
+ * The base implementation of `getTag` without fallbacks for buggy environments.
+ *
+ * @private
+ * @param {*} value The value to query.
+ * @returns {string} Returns the `toStringTag`.
+ */
+function baseGetTag(value) {
+  if (value == null) {
+    return value === undefined ? undefinedTag : nullTag;
+  }
+  return (symToStringTag && symToStringTag in Object(value))
+    ? getRawTag(value)
+    : objectToString(value);
+}
+
+module.exports = baseGetTag;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/_basePropertyOf.js":
+/*!************************************************!*\
+  !*** ./node_modules/lodash/_basePropertyOf.js ***!
+  \************************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+/**
+ * The base implementation of `_.propertyOf` without support for deep paths.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @returns {Function} Returns the new accessor function.
+ */
+function basePropertyOf(object) {
+  return function(key) {
+    return object == null ? undefined : object[key];
+  };
+}
+
+module.exports = basePropertyOf;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/_baseToString.js":
+/*!**********************************************!*\
+  !*** ./node_modules/lodash/_baseToString.js ***!
+  \**********************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+var Symbol = __webpack_require__(/*! ./_Symbol */ "./node_modules/lodash/_Symbol.js"),
+    arrayMap = __webpack_require__(/*! ./_arrayMap */ "./node_modules/lodash/_arrayMap.js"),
+    isArray = __webpack_require__(/*! ./isArray */ "./node_modules/lodash/isArray.js"),
+    isSymbol = __webpack_require__(/*! ./isSymbol */ "./node_modules/lodash/isSymbol.js");
+
+/** Used as references for various `Number` constants. */
+var INFINITY = 1 / 0;
+
+/** Used to convert symbols to primitives and strings. */
+var symbolProto = Symbol ? Symbol.prototype : undefined,
+    symbolToString = symbolProto ? symbolProto.toString : undefined;
+
+/**
+ * The base implementation of `_.toString` which doesn't convert nullish
+ * values to empty strings.
+ *
+ * @private
+ * @param {*} value The value to process.
+ * @returns {string} Returns the string.
+ */
+function baseToString(value) {
+  // Exit early for strings to avoid a performance hit in some environments.
+  if (typeof value == 'string') {
+    return value;
+  }
+  if (isArray(value)) {
+    // Recursively convert values (susceptible to call stack limits).
+    return arrayMap(value, baseToString) + '';
+  }
+  if (isSymbol(value)) {
+    return symbolToString ? symbolToString.call(value) : '';
+  }
+  var result = (value + '');
+  return (result == '0' && (1 / value) == -INFINITY) ? '-0' : result;
+}
+
+module.exports = baseToString;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/_createCompounder.js":
+/*!**************************************************!*\
+  !*** ./node_modules/lodash/_createCompounder.js ***!
+  \**************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+var arrayReduce = __webpack_require__(/*! ./_arrayReduce */ "./node_modules/lodash/_arrayReduce.js"),
+    deburr = __webpack_require__(/*! ./deburr */ "./node_modules/lodash/deburr.js"),
+    words = __webpack_require__(/*! ./words */ "./node_modules/lodash/words.js");
+
+/** Used to compose unicode capture groups. */
+var rsApos = "['\u2019]";
+
+/** Used to match apostrophes. */
+var reApos = RegExp(rsApos, 'g');
+
+/**
+ * Creates a function like `_.camelCase`.
+ *
+ * @private
+ * @param {Function} callback The function to combine each word.
+ * @returns {Function} Returns the new compounder function.
+ */
+function createCompounder(callback) {
+  return function(string) {
+    return arrayReduce(words(deburr(string).replace(reApos, '')), callback, '');
+  };
+}
+
+module.exports = createCompounder;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/_deburrLetter.js":
+/*!**********************************************!*\
+  !*** ./node_modules/lodash/_deburrLetter.js ***!
+  \**********************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+var basePropertyOf = __webpack_require__(/*! ./_basePropertyOf */ "./node_modules/lodash/_basePropertyOf.js");
+
+/** Used to map Latin Unicode letters to basic Latin letters. */
+var deburredLetters = {
+  // Latin-1 Supplement block.
+  '\xc0': 'A',  '\xc1': 'A', '\xc2': 'A', '\xc3': 'A', '\xc4': 'A', '\xc5': 'A',
+  '\xe0': 'a',  '\xe1': 'a', '\xe2': 'a', '\xe3': 'a', '\xe4': 'a', '\xe5': 'a',
+  '\xc7': 'C',  '\xe7': 'c',
+  '\xd0': 'D',  '\xf0': 'd',
+  '\xc8': 'E',  '\xc9': 'E', '\xca': 'E', '\xcb': 'E',
+  '\xe8': 'e',  '\xe9': 'e', '\xea': 'e', '\xeb': 'e',
+  '\xcc': 'I',  '\xcd': 'I', '\xce': 'I', '\xcf': 'I',
+  '\xec': 'i',  '\xed': 'i', '\xee': 'i', '\xef': 'i',
+  '\xd1': 'N',  '\xf1': 'n',
+  '\xd2': 'O',  '\xd3': 'O', '\xd4': 'O', '\xd5': 'O', '\xd6': 'O', '\xd8': 'O',
+  '\xf2': 'o',  '\xf3': 'o', '\xf4': 'o', '\xf5': 'o', '\xf6': 'o', '\xf8': 'o',
+  '\xd9': 'U',  '\xda': 'U', '\xdb': 'U', '\xdc': 'U',
+  '\xf9': 'u',  '\xfa': 'u', '\xfb': 'u', '\xfc': 'u',
+  '\xdd': 'Y',  '\xfd': 'y', '\xff': 'y',
+  '\xc6': 'Ae', '\xe6': 'ae',
+  '\xde': 'Th', '\xfe': 'th',
+  '\xdf': 'ss',
+  // Latin Extended-A block.
+  '\u0100': 'A',  '\u0102': 'A', '\u0104': 'A',
+  '\u0101': 'a',  '\u0103': 'a', '\u0105': 'a',
+  '\u0106': 'C',  '\u0108': 'C', '\u010a': 'C', '\u010c': 'C',
+  '\u0107': 'c',  '\u0109': 'c', '\u010b': 'c', '\u010d': 'c',
+  '\u010e': 'D',  '\u0110': 'D', '\u010f': 'd', '\u0111': 'd',
+  '\u0112': 'E',  '\u0114': 'E', '\u0116': 'E', '\u0118': 'E', '\u011a': 'E',
+  '\u0113': 'e',  '\u0115': 'e', '\u0117': 'e', '\u0119': 'e', '\u011b': 'e',
+  '\u011c': 'G',  '\u011e': 'G', '\u0120': 'G', '\u0122': 'G',
+  '\u011d': 'g',  '\u011f': 'g', '\u0121': 'g', '\u0123': 'g',
+  '\u0124': 'H',  '\u0126': 'H', '\u0125': 'h', '\u0127': 'h',
+  '\u0128': 'I',  '\u012a': 'I', '\u012c': 'I', '\u012e': 'I', '\u0130': 'I',
+  '\u0129': 'i',  '\u012b': 'i', '\u012d': 'i', '\u012f': 'i', '\u0131': 'i',
+  '\u0134': 'J',  '\u0135': 'j',
+  '\u0136': 'K',  '\u0137': 'k', '\u0138': 'k',
+  '\u0139': 'L',  '\u013b': 'L', '\u013d': 'L', '\u013f': 'L', '\u0141': 'L',
+  '\u013a': 'l',  '\u013c': 'l', '\u013e': 'l', '\u0140': 'l', '\u0142': 'l',
+  '\u0143': 'N',  '\u0145': 'N', '\u0147': 'N', '\u014a': 'N',
+  '\u0144': 'n',  '\u0146': 'n', '\u0148': 'n', '\u014b': 'n',
+  '\u014c': 'O',  '\u014e': 'O', '\u0150': 'O',
+  '\u014d': 'o',  '\u014f': 'o', '\u0151': 'o',
+  '\u0154': 'R',  '\u0156': 'R', '\u0158': 'R',
+  '\u0155': 'r',  '\u0157': 'r', '\u0159': 'r',
+  '\u015a': 'S',  '\u015c': 'S', '\u015e': 'S', '\u0160': 'S',
+  '\u015b': 's',  '\u015d': 's', '\u015f': 's', '\u0161': 's',
+  '\u0162': 'T',  '\u0164': 'T', '\u0166': 'T',
+  '\u0163': 't',  '\u0165': 't', '\u0167': 't',
+  '\u0168': 'U',  '\u016a': 'U', '\u016c': 'U', '\u016e': 'U', '\u0170': 'U', '\u0172': 'U',
+  '\u0169': 'u',  '\u016b': 'u', '\u016d': 'u', '\u016f': 'u', '\u0171': 'u', '\u0173': 'u',
+  '\u0174': 'W',  '\u0175': 'w',
+  '\u0176': 'Y',  '\u0177': 'y', '\u0178': 'Y',
+  '\u0179': 'Z',  '\u017b': 'Z', '\u017d': 'Z',
+  '\u017a': 'z',  '\u017c': 'z', '\u017e': 'z',
+  '\u0132': 'IJ', '\u0133': 'ij',
+  '\u0152': 'Oe', '\u0153': 'oe',
+  '\u0149': "'n", '\u017f': 's'
+};
+
+/**
+ * Used by `_.deburr` to convert Latin-1 Supplement and Latin Extended-A
+ * letters to basic Latin letters.
+ *
+ * @private
+ * @param {string} letter The matched letter to deburr.
+ * @returns {string} Returns the deburred letter.
+ */
+var deburrLetter = basePropertyOf(deburredLetters);
+
+module.exports = deburrLetter;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/_freeGlobal.js":
+/*!********************************************!*\
+  !*** ./node_modules/lodash/_freeGlobal.js ***!
+  \********************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+/* WEBPACK VAR INJECTION */(function(global) {/** Detect free variable `global` from Node.js. */
+var freeGlobal = typeof global == 'object' && global && global.Object === Object && global;
+
+module.exports = freeGlobal;
+
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../webpack/buildin/global.js */ "./node_modules/webpack/buildin/global.js")))
+
+/***/ }),
+
+/***/ "./node_modules/lodash/_getRawTag.js":
+/*!*******************************************!*\
+  !*** ./node_modules/lodash/_getRawTag.js ***!
+  \*******************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+var Symbol = __webpack_require__(/*! ./_Symbol */ "./node_modules/lodash/_Symbol.js");
+
+/** Used for built-in method references. */
+var objectProto = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto.hasOwnProperty;
+
+/**
+ * Used to resolve the
+ * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
+ * of values.
+ */
+var nativeObjectToString = objectProto.toString;
+
+/** Built-in value references. */
+var symToStringTag = Symbol ? Symbol.toStringTag : undefined;
+
+/**
+ * A specialized version of `baseGetTag` which ignores `Symbol.toStringTag` values.
+ *
+ * @private
+ * @param {*} value The value to query.
+ * @returns {string} Returns the raw `toStringTag`.
+ */
+function getRawTag(value) {
+  var isOwn = hasOwnProperty.call(value, symToStringTag),
+      tag = value[symToStringTag];
+
+  try {
+    value[symToStringTag] = undefined;
+    var unmasked = true;
+  } catch (e) {}
+
+  var result = nativeObjectToString.call(value);
+  if (unmasked) {
+    if (isOwn) {
+      value[symToStringTag] = tag;
+    } else {
+      delete value[symToStringTag];
+    }
+  }
+  return result;
+}
+
+module.exports = getRawTag;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/_hasUnicodeWord.js":
+/*!************************************************!*\
+  !*** ./node_modules/lodash/_hasUnicodeWord.js ***!
+  \************************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+/** Used to detect strings that need a more robust regexp to match words. */
+var reHasUnicodeWord = /[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/;
+
+/**
+ * Checks if `string` contains a word composed of Unicode symbols.
+ *
+ * @private
+ * @param {string} string The string to inspect.
+ * @returns {boolean} Returns `true` if a word is found, else `false`.
+ */
+function hasUnicodeWord(string) {
+  return reHasUnicodeWord.test(string);
+}
+
+module.exports = hasUnicodeWord;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/_objectToString.js":
+/*!************************************************!*\
+  !*** ./node_modules/lodash/_objectToString.js ***!
+  \************************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+/** Used for built-in method references. */
+var objectProto = Object.prototype;
+
+/**
+ * Used to resolve the
+ * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
+ * of values.
+ */
+var nativeObjectToString = objectProto.toString;
+
+/**
+ * Converts `value` to a string using `Object.prototype.toString`.
+ *
+ * @private
+ * @param {*} value The value to convert.
+ * @returns {string} Returns the converted string.
+ */
+function objectToString(value) {
+  return nativeObjectToString.call(value);
+}
+
+module.exports = objectToString;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/_root.js":
+/*!**************************************!*\
+  !*** ./node_modules/lodash/_root.js ***!
+  \**************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+var freeGlobal = __webpack_require__(/*! ./_freeGlobal */ "./node_modules/lodash/_freeGlobal.js");
+
+/** Detect free variable `self`. */
+var freeSelf = typeof self == 'object' && self && self.Object === Object && self;
+
+/** Used as a reference to the global object. */
+var root = freeGlobal || freeSelf || Function('return this')();
+
+module.exports = root;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/_unicodeWords.js":
+/*!**********************************************!*\
+  !*** ./node_modules/lodash/_unicodeWords.js ***!
+  \**********************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+/** Used to compose unicode character classes. */
+var rsAstralRange = '\\ud800-\\udfff',
+    rsComboMarksRange = '\\u0300-\\u036f',
+    reComboHalfMarksRange = '\\ufe20-\\ufe2f',
+    rsComboSymbolsRange = '\\u20d0-\\u20ff',
+    rsComboRange = rsComboMarksRange + reComboHalfMarksRange + rsComboSymbolsRange,
+    rsDingbatRange = '\\u2700-\\u27bf',
+    rsLowerRange = 'a-z\\xdf-\\xf6\\xf8-\\xff',
+    rsMathOpRange = '\\xac\\xb1\\xd7\\xf7',
+    rsNonCharRange = '\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf',
+    rsPunctuationRange = '\\u2000-\\u206f',
+    rsSpaceRange = ' \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000',
+    rsUpperRange = 'A-Z\\xc0-\\xd6\\xd8-\\xde',
+    rsVarRange = '\\ufe0e\\ufe0f',
+    rsBreakRange = rsMathOpRange + rsNonCharRange + rsPunctuationRange + rsSpaceRange;
+
+/** Used to compose unicode capture groups. */
+var rsApos = "['\u2019]",
+    rsBreak = '[' + rsBreakRange + ']',
+    rsCombo = '[' + rsComboRange + ']',
+    rsDigits = '\\d+',
+    rsDingbat = '[' + rsDingbatRange + ']',
+    rsLower = '[' + rsLowerRange + ']',
+    rsMisc = '[^' + rsAstralRange + rsBreakRange + rsDigits + rsDingbatRange + rsLowerRange + rsUpperRange + ']',
+    rsFitz = '\\ud83c[\\udffb-\\udfff]',
+    rsModifier = '(?:' + rsCombo + '|' + rsFitz + ')',
+    rsNonAstral = '[^' + rsAstralRange + ']',
+    rsRegional = '(?:\\ud83c[\\udde6-\\uddff]){2}',
+    rsSurrPair = '[\\ud800-\\udbff][\\udc00-\\udfff]',
+    rsUpper = '[' + rsUpperRange + ']',
+    rsZWJ = '\\u200d';
+
+/** Used to compose unicode regexes. */
+var rsMiscLower = '(?:' + rsLower + '|' + rsMisc + ')',
+    rsMiscUpper = '(?:' + rsUpper + '|' + rsMisc + ')',
+    rsOptContrLower = '(?:' + rsApos + '(?:d|ll|m|re|s|t|ve))?',
+    rsOptContrUpper = '(?:' + rsApos + '(?:D|LL|M|RE|S|T|VE))?',
+    reOptMod = rsModifier + '?',
+    rsOptVar = '[' + rsVarRange + ']?',
+    rsOptJoin = '(?:' + rsZWJ + '(?:' + [rsNonAstral, rsRegional, rsSurrPair].join('|') + ')' + rsOptVar + reOptMod + ')*',
+    rsOrdLower = '\\d*(?:1st|2nd|3rd|(?![123])\\dth)(?=\\b|[A-Z_])',
+    rsOrdUpper = '\\d*(?:1ST|2ND|3RD|(?![123])\\dTH)(?=\\b|[a-z_])',
+    rsSeq = rsOptVar + reOptMod + rsOptJoin,
+    rsEmoji = '(?:' + [rsDingbat, rsRegional, rsSurrPair].join('|') + ')' + rsSeq;
+
+/** Used to match complex or compound words. */
+var reUnicodeWord = RegExp([
+  rsUpper + '?' + rsLower + '+' + rsOptContrLower + '(?=' + [rsBreak, rsUpper, '$'].join('|') + ')',
+  rsMiscUpper + '+' + rsOptContrUpper + '(?=' + [rsBreak, rsUpper + rsMiscLower, '$'].join('|') + ')',
+  rsUpper + '?' + rsMiscLower + '+' + rsOptContrLower,
+  rsUpper + '+' + rsOptContrUpper,
+  rsOrdUpper,
+  rsOrdLower,
+  rsDigits,
+  rsEmoji
+].join('|'), 'g');
+
+/**
+ * Splits a Unicode `string` into an array of its words.
+ *
+ * @private
+ * @param {string} The string to inspect.
+ * @returns {Array} Returns the words of `string`.
+ */
+function unicodeWords(string) {
+  return string.match(reUnicodeWord) || [];
+}
+
+module.exports = unicodeWords;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/deburr.js":
+/*!***************************************!*\
+  !*** ./node_modules/lodash/deburr.js ***!
+  \***************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+var deburrLetter = __webpack_require__(/*! ./_deburrLetter */ "./node_modules/lodash/_deburrLetter.js"),
+    toString = __webpack_require__(/*! ./toString */ "./node_modules/lodash/toString.js");
+
+/** Used to match Latin Unicode letters (excluding mathematical operators). */
+var reLatin = /[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g;
+
+/** Used to compose unicode character classes. */
+var rsComboMarksRange = '\\u0300-\\u036f',
+    reComboHalfMarksRange = '\\ufe20-\\ufe2f',
+    rsComboSymbolsRange = '\\u20d0-\\u20ff',
+    rsComboRange = rsComboMarksRange + reComboHalfMarksRange + rsComboSymbolsRange;
+
+/** Used to compose unicode capture groups. */
+var rsCombo = '[' + rsComboRange + ']';
+
+/**
+ * Used to match [combining diacritical marks](https://en.wikipedia.org/wiki/Combining_Diacritical_Marks) and
+ * [combining diacritical marks for symbols](https://en.wikipedia.org/wiki/Combining_Diacritical_Marks_for_Symbols).
+ */
+var reComboMark = RegExp(rsCombo, 'g');
+
+/**
+ * Deburrs `string` by converting
+ * [Latin-1 Supplement](https://en.wikipedia.org/wiki/Latin-1_Supplement_(Unicode_block)#Character_table)
+ * and [Latin Extended-A](https://en.wikipedia.org/wiki/Latin_Extended-A)
+ * letters to basic Latin letters and removing
+ * [combining diacritical marks](https://en.wikipedia.org/wiki/Combining_Diacritical_Marks).
+ *
+ * @static
+ * @memberOf _
+ * @since 3.0.0
+ * @category String
+ * @param {string} [string=''] The string to deburr.
+ * @returns {string} Returns the deburred string.
+ * @example
+ *
+ * _.deburr('déjà vu');
+ * // => 'deja vu'
+ */
+function deburr(string) {
+  string = toString(string);
+  return string && string.replace(reLatin, deburrLetter).replace(reComboMark, '');
+}
+
+module.exports = deburr;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/isArray.js":
+/*!****************************************!*\
+  !*** ./node_modules/lodash/isArray.js ***!
+  \****************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+/**
+ * Checks if `value` is classified as an `Array` object.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an array, else `false`.
+ * @example
+ *
+ * _.isArray([1, 2, 3]);
+ * // => true
+ *
+ * _.isArray(document.body.children);
+ * // => false
+ *
+ * _.isArray('abc');
+ * // => false
+ *
+ * _.isArray(_.noop);
+ * // => false
+ */
+var isArray = Array.isArray;
+
+module.exports = isArray;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/isObjectLike.js":
+/*!*********************************************!*\
+  !*** ./node_modules/lodash/isObjectLike.js ***!
+  \*********************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+/**
+ * Checks if `value` is object-like. A value is object-like if it's not `null`
+ * and has a `typeof` result of "object".
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
+ * @example
+ *
+ * _.isObjectLike({});
+ * // => true
+ *
+ * _.isObjectLike([1, 2, 3]);
+ * // => true
+ *
+ * _.isObjectLike(_.noop);
+ * // => false
+ *
+ * _.isObjectLike(null);
+ * // => false
+ */
+function isObjectLike(value) {
+  return value != null && typeof value == 'object';
+}
+
+module.exports = isObjectLike;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/isSymbol.js":
+/*!*****************************************!*\
+  !*** ./node_modules/lodash/isSymbol.js ***!
+  \*****************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+var baseGetTag = __webpack_require__(/*! ./_baseGetTag */ "./node_modules/lodash/_baseGetTag.js"),
+    isObjectLike = __webpack_require__(/*! ./isObjectLike */ "./node_modules/lodash/isObjectLike.js");
+
+/** `Object#toString` result references. */
+var symbolTag = '[object Symbol]';
+
+/**
+ * Checks if `value` is classified as a `Symbol` primitive or object.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a symbol, else `false`.
+ * @example
+ *
+ * _.isSymbol(Symbol.iterator);
+ * // => true
+ *
+ * _.isSymbol('abc');
+ * // => false
+ */
+function isSymbol(value) {
+  return typeof value == 'symbol' ||
+    (isObjectLike(value) && baseGetTag(value) == symbolTag);
+}
+
+module.exports = isSymbol;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/kebabCase.js":
+/*!******************************************!*\
+  !*** ./node_modules/lodash/kebabCase.js ***!
+  \******************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+var createCompounder = __webpack_require__(/*! ./_createCompounder */ "./node_modules/lodash/_createCompounder.js");
+
+/**
+ * Converts `string` to
+ * [kebab case](https://en.wikipedia.org/wiki/Letter_case#Special_case_styles).
+ *
+ * @static
+ * @memberOf _
+ * @since 3.0.0
+ * @category String
+ * @param {string} [string=''] The string to convert.
+ * @returns {string} Returns the kebab cased string.
+ * @example
+ *
+ * _.kebabCase('Foo Bar');
+ * // => 'foo-bar'
+ *
+ * _.kebabCase('fooBar');
+ * // => 'foo-bar'
+ *
+ * _.kebabCase('__FOO_BAR__');
+ * // => 'foo-bar'
+ */
+var kebabCase = createCompounder(function(result, word, index) {
+  return result + (index ? '-' : '') + word.toLowerCase();
+});
+
+module.exports = kebabCase;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/toString.js":
+/*!*****************************************!*\
+  !*** ./node_modules/lodash/toString.js ***!
+  \*****************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+var baseToString = __webpack_require__(/*! ./_baseToString */ "./node_modules/lodash/_baseToString.js");
+
+/**
+ * Converts `value` to a string. An empty string is returned for `null`
+ * and `undefined` values. The sign of `-0` is preserved.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to convert.
+ * @returns {string} Returns the converted string.
+ * @example
+ *
+ * _.toString(null);
+ * // => ''
+ *
+ * _.toString(-0);
+ * // => '-0'
+ *
+ * _.toString([1, 2, 3]);
+ * // => '1,2,3'
+ */
+function toString(value) {
+  return value == null ? '' : baseToString(value);
+}
+
+module.exports = toString;
+
+
+/***/ }),
+
+/***/ "./node_modules/lodash/words.js":
+/*!**************************************!*\
+  !*** ./node_modules/lodash/words.js ***!
+  \**************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+var asciiWords = __webpack_require__(/*! ./_asciiWords */ "./node_modules/lodash/_asciiWords.js"),
+    hasUnicodeWord = __webpack_require__(/*! ./_hasUnicodeWord */ "./node_modules/lodash/_hasUnicodeWord.js"),
+    toString = __webpack_require__(/*! ./toString */ "./node_modules/lodash/toString.js"),
+    unicodeWords = __webpack_require__(/*! ./_unicodeWords */ "./node_modules/lodash/_unicodeWords.js");
+
+/**
+ * Splits `string` into an array of its words.
+ *
+ * @static
+ * @memberOf _
+ * @since 3.0.0
+ * @category String
+ * @param {string} [string=''] The string to inspect.
+ * @param {RegExp|string} [pattern] The pattern to match words.
+ * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+ * @returns {Array} Returns the words of `string`.
+ * @example
+ *
+ * _.words('fred, barney, & pebbles');
+ * // => ['fred', 'barney', 'pebbles']
+ *
+ * _.words('fred, barney, & pebbles', /[^, ]+/g);
+ * // => ['fred', 'barney', '&', 'pebbles']
+ */
+function words(string, pattern, guard) {
+  string = toString(string);
+  pattern = guard ? undefined : pattern;
+
+  if (pattern === undefined) {
+    return hasUnicodeWord(string) ? unicodeWords(string) : asciiWords(string);
+  }
+  return string.match(pattern) || [];
+}
+
+module.exports = words;
+
+
 /***/ }),
 
 /***/ "./node_modules/makerspace-ts-api-client/dist/apiClient.js":
@@ -103190,6 +104092,10 @@ function deleteTransaction(params) {
     return exports.makeRequest("DELETE", "/billing/transactions/{id}".replace("{id}", params.id));
 }
 exports.deleteTransaction = deleteTransaction;
+function message(params) {
+    return exports.makeRequest("POST", "/client_error_handler", { notification: params.messageDetails });
+}
+exports.message = message;
 function getDocument(params) {
     return exports.makeRequest("GET", "/documents/{id}".replace("{id}", params.id), params);
 }
@@ -103210,6 +104116,10 @@ function listInvoiceOptions(params) {
     return exports.makeRequest("GET", "/invoice_options", params, "invoiceOptions");
 }
 exports.listInvoiceOptions = listInvoiceOptions;
+function getInvoiceOption(params) {
+    return exports.makeRequest("GET", "/invoice_options/{id}".replace("{id}", params.id), undefined, "invoiceOption");
+}
+exports.getInvoiceOption = getInvoiceOption;
 function listInvoices(params) {
     return exports.makeRequest("GET", "/invoices", params, "invoices");
 }
@@ -203743,6 +204653,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var app_PublicRouting__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! app/PublicRouting */ "./src/app/PublicRouting.tsx");
 /* harmony import */ var app_constants__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! app/constants */ "./src/app/constants.ts");
 /* harmony import */ var ui_member_utils__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ui/member/utils */ "./src/ui/member/utils.ts");
+/* harmony import */ var src_ui_common_ErrorBoundary__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! src/ui/common/ErrorBoundary */ "./src/ui/common/ErrorBoundary.tsx");
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
@@ -203762,6 +204673,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 
 
+
 var publicPaths = [app_constants__WEBPACK_IMPORTED_MODULE_9__["Routing"].Login, app_constants__WEBPACK_IMPORTED_MODULE_9__["Routing"].SignUp, app_constants__WEBPACK_IMPORTED_MODULE_9__["Routing"].PasswordReset];
 
 var App = function App() {
@@ -203821,7 +204733,7 @@ var App = function App() {
       }
     }
   }, [isRequesting]);
-  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", {
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](src_ui_common_ErrorBoundary__WEBPACK_IMPORTED_MODULE_11__["default"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", {
     className: "root"
   }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_Header__WEBPACK_IMPORTED_MODULE_4__["default"], null), attemptingLogin ? react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_5__["default"], {
     id: "body"
@@ -203829,7 +204741,7 @@ var App = function App() {
     permissions: permissions,
     currentUserId: currentUserId,
     isAdmin: isAdmin
-  }) : react__WEBPACK_IMPORTED_MODULE_0__["createElement"](app_PublicRouting__WEBPACK_IMPORTED_MODULE_8__["default"], null));
+  }) : react__WEBPACK_IMPORTED_MODULE_0__["createElement"](app_PublicRouting__WEBPACK_IMPORTED_MODULE_8__["default"], null)));
 };
 
 /* harmony default export */ __webpack_exports__["default"] = (App);
@@ -204143,6 +205055,7 @@ var Properties;
   Properties["PlanId"] = "planId";
   Properties["Disabled"] = "disabled";
   Properties["DiscountId"] = "discountId";
+  Properties["IsPromotion"] = "isPromotion";
 })(Properties || (Properties = {}));
 
 /***/ }),
@@ -205673,35 +206586,52 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react-redux */ "./node_modules/react-redux/es/index.js");
 /* harmony import */ var use_react_router__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! use-react-router */ "./node_modules/use-react-router/use-react-router.js");
 /* harmony import */ var use_react_router__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(use_react_router__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @material-ui/core/TextField */ "./node_modules/@material-ui/core/TextField/index.js");
-/* harmony import */ var _material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @material-ui/core/Grid */ "./node_modules/@material-ui/core/Grid/index.js");
-/* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var _material_ui_core_Button__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/core/Button */ "./node_modules/@material-ui/core/Button/index.js");
-/* harmony import */ var _material_ui_core_Button__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Button__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var _material_ui_core_Card__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @material-ui/core/Card */ "./node_modules/@material-ui/core/Card/index.js");
-/* harmony import */ var _material_ui_core_Card__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Card__WEBPACK_IMPORTED_MODULE_6__);
-/* harmony import */ var _material_ui_core_Paper__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @material-ui/core/Paper */ "./node_modules/@material-ui/core/Paper/index.js");
-/* harmony import */ var _material_ui_core_Paper__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Paper__WEBPACK_IMPORTED_MODULE_7__);
-/* harmony import */ var _material_ui_core_CardContent__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @material-ui/core/CardContent */ "./node_modules/@material-ui/core/CardContent/index.js");
-/* harmony import */ var _material_ui_core_CardContent__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_CardContent__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var _material_ui_core_InputAdornment__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! @material-ui/core/InputAdornment */ "./node_modules/@material-ui/core/InputAdornment/index.js");
-/* harmony import */ var _material_ui_core_InputAdornment__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_InputAdornment__WEBPACK_IMPORTED_MODULE_9__);
-/* harmony import */ var _material_ui_icons_RemoveRedEye__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! @material-ui/icons/RemoveRedEye */ "./node_modules/@material-ui/icons/RemoveRedEye.js");
-/* harmony import */ var _material_ui_icons_RemoveRedEye__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(_material_ui_icons_RemoveRedEye__WEBPACK_IMPORTED_MODULE_10__);
-/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! makerspace-ts-api-client */ "./node_modules/makerspace-ts-api-client/dist/apiClient.js");
-/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_11__);
-/* harmony import */ var ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ui/auth/constants */ "./src/ui/auth/constants.ts");
-/* harmony import */ var ui_common_ErrorMessage__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ui/common/ErrorMessage */ "./src/ui/common/ErrorMessage.tsx");
-/* harmony import */ var ui_common_Form__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ui/common/Form */ "./src/ui/common/Form.tsx");
-/* harmony import */ var _hooks_useModal__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../hooks/useModal */ "./src/ui/hooks/useModal.ts");
-/* harmony import */ var _common_FormModal__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../common/FormModal */ "./src/ui/common/FormModal.tsx");
-/* harmony import */ var app_constants__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! app/constants */ "./src/app/constants.ts");
-/* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./actions */ "./src/ui/auth/actions.ts");
-/* harmony import */ var _reducer_hooks__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../reducer/hooks */ "./src/ui/reducer/hooks.ts");
-/* harmony import */ var _hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../hooks/useWriteTransaction */ "./src/ui/hooks/useWriteTransaction.ts");
-/* harmony import */ var ui_membership_MembershipSelectForm__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ui/membership/MembershipSelectForm */ "./src/ui/membership/MembershipSelectForm.tsx");
-/* harmony import */ var _membership_InvoicingGate__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../membership/InvoicingGate */ "./src/ui/membership/InvoicingGate.tsx");
+/* harmony import */ var lodash_kebabCase__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! lodash/kebabCase */ "./node_modules/lodash/kebabCase.js");
+/* harmony import */ var lodash_kebabCase__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(lodash_kebabCase__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _material_ui_core_FormLabel__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @material-ui/core/FormLabel */ "./node_modules/@material-ui/core/FormLabel/index.js");
+/* harmony import */ var _material_ui_core_FormLabel__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_FormLabel__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _material_ui_core_Select__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/core/Select */ "./node_modules/@material-ui/core/Select/index.js");
+/* harmony import */ var _material_ui_core_Select__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Select__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var _material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @material-ui/core/TextField */ "./node_modules/@material-ui/core/TextField/index.js");
+/* harmony import */ var _material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @material-ui/core/Grid */ "./node_modules/@material-ui/core/Grid/index.js");
+/* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var _material_ui_core_Button__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @material-ui/core/Button */ "./node_modules/@material-ui/core/Button/index.js");
+/* harmony import */ var _material_ui_core_Button__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Button__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var _material_ui_core_Card__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! @material-ui/core/Card */ "./node_modules/@material-ui/core/Card/index.js");
+/* harmony import */ var _material_ui_core_Card__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Card__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var _material_ui_core_Paper__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! @material-ui/core/Paper */ "./node_modules/@material-ui/core/Paper/index.js");
+/* harmony import */ var _material_ui_core_Paper__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Paper__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var _material_ui_core_CardContent__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! @material-ui/core/CardContent */ "./node_modules/@material-ui/core/CardContent/index.js");
+/* harmony import */ var _material_ui_core_CardContent__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_CardContent__WEBPACK_IMPORTED_MODULE_11__);
+/* harmony import */ var _material_ui_core_InputAdornment__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! @material-ui/core/InputAdornment */ "./node_modules/@material-ui/core/InputAdornment/index.js");
+/* harmony import */ var _material_ui_core_InputAdornment__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_InputAdornment__WEBPACK_IMPORTED_MODULE_12__);
+/* harmony import */ var _material_ui_icons_RemoveRedEye__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! @material-ui/icons/RemoveRedEye */ "./node_modules/@material-ui/icons/RemoveRedEye.js");
+/* harmony import */ var _material_ui_icons_RemoveRedEye__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(_material_ui_icons_RemoveRedEye__WEBPACK_IMPORTED_MODULE_13__);
+/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! makerspace-ts-api-client */ "./node_modules/makerspace-ts-api-client/dist/apiClient.js");
+/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_14__);
+/* harmony import */ var ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ui/auth/constants */ "./src/ui/auth/constants.ts");
+/* harmony import */ var ui_common_ErrorMessage__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ui/common/ErrorMessage */ "./src/ui/common/ErrorMessage.tsx");
+/* harmony import */ var ui_common_Form__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ui/common/Form */ "./src/ui/common/Form.tsx");
+/* harmony import */ var _hooks_useModal__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../hooks/useModal */ "./src/ui/hooks/useModal.ts");
+/* harmony import */ var _common_FormModal__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../common/FormModal */ "./src/ui/common/FormModal.tsx");
+/* harmony import */ var app_constants__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! app/constants */ "./src/app/constants.ts");
+/* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ./actions */ "./src/ui/auth/actions.ts");
+/* harmony import */ var _reducer_hooks__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../reducer/hooks */ "./src/ui/reducer/hooks.ts");
+/* harmony import */ var _hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ../hooks/useWriteTransaction */ "./src/ui/hooks/useWriteTransaction.ts");
+/* harmony import */ var ui_membership_MembershipSelectForm__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ui/membership/MembershipSelectForm */ "./src/ui/membership/MembershipSelectForm.tsx");
+/* harmony import */ var _membership_InvoicingGate__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ../membership/InvoicingGate */ "./src/ui/membership/InvoicingGate.tsx");
+/* harmony import */ var _member_states__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ../member/states */ "./src/ui/member/states.ts");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -205734,13 +206664,17 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 
 
+
+
+
+
 
 
 
 
 
 var SignUpFormComponent = function SignUpFormComponent() {
-  var _useModal = Object(_hooks_useModal__WEBPACK_IMPORTED_MODULE_15__["default"])(),
+  var _useModal = Object(_hooks_useModal__WEBPACK_IMPORTED_MODULE_18__["default"])(),
       emailNoteOpen = _useModal.isOpen,
       openEmailNote = _useModal.openModal,
       closeEmailNote = _useModal.closeModal;
@@ -205750,25 +206684,25 @@ var SignUpFormComponent = function SignUpFormComponent() {
       search = _useReactRouter.location.search;
 
   var goToLogin = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](function () {
-    return history.push(app_constants__WEBPACK_IMPORTED_MODULE_17__["Routing"].Login);
+    return history.push(app_constants__WEBPACK_IMPORTED_MODULE_20__["Routing"].Login);
   }, [history]);
   var dispatch = Object(react_redux__WEBPACK_IMPORTED_MODULE_1__["useDispatch"])();
 
-  var _useAuthState = Object(_reducer_hooks__WEBPACK_IMPORTED_MODULE_19__["useAuthState"])(),
+  var _useAuthState = Object(_reducer_hooks__WEBPACK_IMPORTED_MODULE_22__["useAuthState"])(),
       isRequesting = _useAuthState.isRequesting,
       error = _useAuthState.error;
 
   var searchParams = new URLSearchParams(search);
 
   var _React$useState = react__WEBPACK_IMPORTED_MODULE_0__["useState"]({
-    id: searchParams.get(ui_membership_MembershipSelectForm__WEBPACK_IMPORTED_MODULE_21__["invoiceOptionParam"]),
-    discountId: searchParams.get(ui_membership_MembershipSelectForm__WEBPACK_IMPORTED_MODULE_21__["discountParam"])
+    id: searchParams.get(ui_membership_MembershipSelectForm__WEBPACK_IMPORTED_MODULE_24__["invoiceOptionParam"]),
+    discountId: searchParams.get(ui_membership_MembershipSelectForm__WEBPACK_IMPORTED_MODULE_24__["discountParam"])
   }),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       option = _React$useState2[0],
       setOption = _React$useState2[1];
 
-  var _useWriteTransaction = Object(_hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_20__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_11__["createInvoice"]),
+  var _useWriteTransaction = Object(_hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_23__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_14__["createInvoice"]),
       buildInvoice = _useWriteTransaction.call;
 
   var _React$useState3 = react__WEBPACK_IMPORTED_MODULE_0__["useState"](true),
@@ -205787,13 +206721,13 @@ var SignUpFormComponent = function SignUpFormComponent() {
     var _ref = _asyncToGenerator(
     /*#__PURE__*/
     regeneratorRuntime.mark(function _callee(form) {
-      var validSignUp;
+      var validSignUp, street, unit, city, state, postalCode, rest;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return form.simpleValidate(ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["SignUpFields"]);
+              return form.simpleValidate(ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"]);
 
             case 2:
               validSignUp = _context.sent;
@@ -205806,21 +206740,30 @@ var SignUpFormComponent = function SignUpFormComponent() {
               return _context.abrupt("return");
 
             case 5:
-              _context.next = 7;
-              return dispatch(Object(_actions__WEBPACK_IMPORTED_MODULE_18__["submitSignUpAction"])(validSignUp));
+              street = validSignUp.street, unit = validSignUp.unit, city = validSignUp.city, state = validSignUp.state, postalCode = validSignUp.postalCode, rest = _objectWithoutProperties(validSignUp, ["street", "unit", "city", "state", "postalCode"]);
+              _context.next = 8;
+              return dispatch(Object(_actions__WEBPACK_IMPORTED_MODULE_21__["submitSignUpAction"])(_objectSpread({}, rest, {
+                address: {
+                  street: street,
+                  unit: unit,
+                  city: city,
+                  state: state,
+                  postalCode: postalCode
+                }
+              })));
 
-            case 7:
+            case 8:
               if (!option) {
-                _context.next = 10;
+                _context.next = 11;
                 break;
               }
 
-              _context.next = 10;
+              _context.next = 11;
               return buildInvoice({
                 createInvoiceDetails: option
               });
 
-            case 10:
+            case 11:
             case "end":
               return _context.stop();
           }
@@ -205833,9 +206776,9 @@ var SignUpFormComponent = function SignUpFormComponent() {
     };
   }(), [option]);
   react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](function () {
-    if (!isRequesting && error && error.match(new RegExp(ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["EmailExistsError"]))) {
+    if (!isRequesting && error && error.match(new RegExp(ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["EmailExistsError"]))) {
       dispatch({
-        type: ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["Action"].LogoutSuccess
+        type: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["Action"].LogoutSuccess
       }); // Clear error & redirect
 
       openEmailNote();
@@ -205847,119 +206790,198 @@ var SignUpFormComponent = function SignUpFormComponent() {
       id: option.id
     });
   }, [setOption]);
-  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default.a, {
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
     container: true,
     justify: "center",
     spacing: 16
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default.a, {
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
     item: true,
     md: 10,
     xs: 12
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default.a, {
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
     container: true,
     justify: "center",
     spacing: 16
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default.a, {
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
     item: true,
     xs: 12
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Paper__WEBPACK_IMPORTED_MODULE_7___default.a, {
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Paper__WEBPACK_IMPORTED_MODULE_10___default.a, {
     style: {
       minWidth: 275,
       padding: "1rem"
     }
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_Form__WEBPACK_IMPORTED_MODULE_14__["default"], {
-    id: ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["signUpPrefix"],
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_Form__WEBPACK_IMPORTED_MODULE_17__["default"], {
+    id: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["signUpPrefix"],
     loading: isRequesting,
     title: "Create an Account",
     onSubmit: submit,
     submitText: "Sign Up"
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default.a, {
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
     container: true,
     spacing: 16
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default.a, {
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
     item: true,
-    xs: 6
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_3___default.a, {
+    xs: 12,
+    sm: 6
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_6___default.a, {
     fullWidth: true,
     required: true,
-    label: ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["SignUpFields"].firstname.label,
-    name: ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["SignUpFields"].firstname.name,
-    id: ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["SignUpFields"].firstname.name,
-    placeholder: ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["SignUpFields"].firstname.placeholder
-  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default.a, {
+    label: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].firstname.label,
+    name: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].firstname.name,
+    id: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].firstname.name,
+    placeholder: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].firstname.placeholder
+  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
     item: true,
-    xs: 6
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_3___default.a, {
+    xs: 12,
+    sm: 6
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_6___default.a, {
     fullWidth: true,
     required: true,
-    label: ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["SignUpFields"].lastname.label,
-    name: ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["SignUpFields"].lastname.name,
-    id: ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["SignUpFields"].lastname.name,
-    placeholder: ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["SignUpFields"].lastname.placeholder
-  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default.a, {
+    label: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].lastname.label,
+    name: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].lastname.name,
+    id: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].lastname.name,
+    placeholder: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].lastname.placeholder
+  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
     item: true,
-    xs: 12
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_3___default.a, {
+    xs: 12,
+    sm: 6
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_6___default.a, {
     fullWidth: true,
     required: true,
-    label: ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["SignUpFields"].email.label,
-    name: ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["SignUpFields"].email.name,
-    id: ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["SignUpFields"].email.name,
-    placeholder: ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["SignUpFields"].email.placeholder,
+    label: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].email.label,
+    name: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].email.name,
+    id: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].email.name,
+    placeholder: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].email.placeholder,
     type: "email"
-  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default.a, {
+  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
     item: true,
-    xs: 12
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_3___default.a, {
+    xs: 12,
+    sm: 6
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_6___default.a, {
     fullWidth: true,
     required: true,
-    label: ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["SignUpFields"].password.label,
-    name: ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["SignUpFields"].password.name,
-    id: ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["SignUpFields"].password.name,
-    placeholder: ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["SignUpFields"].password.placeholder,
+    label: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].password.label,
+    name: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].password.name,
+    id: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].password.name,
+    placeholder: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].password.placeholder,
     type: mask ? 'password' : 'text',
     InputProps: {
-      endAdornment: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_InputAdornment__WEBPACK_IMPORTED_MODULE_9___default.a, {
+      endAdornment: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_InputAdornment__WEBPACK_IMPORTED_MODULE_12___default.a, {
         position: "end"
-      }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_icons_RemoveRedEye__WEBPACK_IMPORTED_MODULE_10___default.a, {
+      }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_icons_RemoveRedEye__WEBPACK_IMPORTED_MODULE_13___default.a, {
         style: {
           cursor: 'pointer'
         },
         onClick: toggleMask
       }))
     }
-  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_membership_InvoicingGate__WEBPACK_IMPORTED_MODULE_22__["default"], null, function (open) {
-    return open && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default.a, {
+  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
+    item: true,
+    xs: 12,
+    sm: 6
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_6___default.a, {
+    fullWidth: true,
+    required: true,
+    label: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].street.label,
+    name: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].street.name,
+    id: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].street.name,
+    placeholder: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].street.placeholder
+  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
+    item: true,
+    xs: 12,
+    sm: 6
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_6___default.a, {
+    fullWidth: true,
+    label: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].unit.label,
+    name: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].unit.name,
+    id: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].unit.name,
+    placeholder: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].unit.placeholder
+  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
+    item: true,
+    sm: 12,
+    md: 5
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_6___default.a, {
+    fullWidth: true,
+    required: true,
+    label: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].city.label,
+    name: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].city.name,
+    id: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].city.name,
+    placeholder: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].city.placeholder
+  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
+    item: true,
+    sm: 6,
+    md: 4
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormLabel__WEBPACK_IMPORTED_MODULE_4___default.a, {
+    component: "legend"
+  }, ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].state.label), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Select__WEBPACK_IMPORTED_MODULE_5___default.a, {
+    name: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].state.name,
+    fullWidth: true,
+    "native": true,
+    required: true,
+    placeholder: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].state.placeholder
+  }, [react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("option", {
+    id: "".concat(ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].state.name, "-option-none"),
+    key: "none",
+    value: ""
+  }, ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].state.placeholder)].concat(Object.keys(_member_states__WEBPACK_IMPORTED_MODULE_26__["states"]).map(function (key) {
+    return react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("option", {
+      id: "".concat(ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].state.name, "-option-").concat(lodash_kebabCase__WEBPACK_IMPORTED_MODULE_3___default()(key)),
+      key: lodash_kebabCase__WEBPACK_IMPORTED_MODULE_3___default()(key),
+      value: key
+    }, key);
+  })))), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
+    item: true,
+    sm: 6,
+    md: 3
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_6___default.a, {
+    fullWidth: true,
+    required: true,
+    label: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].postalCode.label,
+    name: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].postalCode.name,
+    id: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].postalCode.name,
+    placeholder: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].postalCode.placeholder
+  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
+    item: true,
+    xs: 12
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_6___default.a, {
+    fullWidth: true,
+    label: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].phone.label,
+    name: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].phone.name,
+    id: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].phone.name,
+    placeholder: ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["SignUpFields"].phone.placeholder,
+    type: "phone"
+  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_membership_InvoicingGate__WEBPACK_IMPORTED_MODULE_25__["default"], null, function (open) {
+    return open && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
       item: true,
       xs: 12
-    }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_membership_MembershipSelectForm__WEBPACK_IMPORTED_MODULE_21__["default"], {
+    }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_membership_MembershipSelectForm__WEBPACK_IMPORTED_MODULE_24__["default"], {
       onSelect: selectMembership,
       allowNone: true
     }));
-  }), !isRequesting && error && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_ErrorMessage__WEBPACK_IMPORTED_MODULE_13__["default"], {
-    id: "".concat(ui_auth_constants__WEBPACK_IMPORTED_MODULE_12__["signUpPrefix"], "-error"),
+  }), !isRequesting && error && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_ErrorMessage__WEBPACK_IMPORTED_MODULE_16__["default"], {
+    id: "".concat(ui_auth_constants__WEBPACK_IMPORTED_MODULE_15__["signUpPrefix"], "-error"),
     error: error
-  }))))), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default.a, {
+  }))))), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
     item: true,
     xs: 12
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Button__WEBPACK_IMPORTED_MODULE_5___default.a, {
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Button__WEBPACK_IMPORTED_MODULE_8___default.a, {
     id: "auth-toggle",
     variant: "outlined",
     color: "secondary",
     fullWidth: true,
     onClick: goToLogin
-  }, "Already a Member? Login"))))), emailNoteOpen && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_FormModal__WEBPACK_IMPORTED_MODULE_16__["default"], {
+  }, "Already a Member? Login"))))), emailNoteOpen && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_FormModal__WEBPACK_IMPORTED_MODULE_19__["default"], {
     isOpen: true,
     id: "email-exists",
     title: "Email already exists",
     onSubmit: goToLogin,
     submitText: "Login",
     closeHandler: closeEmailNote
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Card__WEBPACK_IMPORTED_MODULE_6___default.a, {
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Card__WEBPACK_IMPORTED_MODULE_9___default.a, {
     style: {
       minWidth: 275
     }
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_CardContent__WEBPACK_IMPORTED_MODULE_8___default.a, null, "An account with this email already exists.  Please login to continue."))));
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_CardContent__WEBPACK_IMPORTED_MODULE_11___default.a, null, "An account with this email already exists.  Please login to continue."))));
 };
 
 /* harmony default export */ __webpack_exports__["default"] = (SignUpFormComponent);
@@ -206380,6 +207402,50 @@ var SignUpFields = {
   discount: {
     label: "Apply 10% Student, Senior and Military discount (ID required at orientation)",
     name: "".concat(signUpPrefix, "-discount")
+  },
+  phone: {
+    label: "Phone Number",
+    name: "".concat(signUpPrefix, "-phone")
+  },
+  street: {
+    label: "Street Address",
+    name: "".concat(signUpPrefix, "-street"),
+    placeholder: "Enter street address",
+    validate: function validate(val) {
+      return !!val;
+    },
+    error: "Required"
+  },
+  unit: {
+    label: "Unit or Apt #",
+    name: "".concat(signUpPrefix, "-unit")
+  },
+  city: {
+    label: "City",
+    name: "".concat(signUpPrefix, "-city"),
+    placeholder: "Enter city",
+    validate: function validate(val) {
+      return !!val;
+    },
+    error: "Required"
+  },
+  state: {
+    label: "State",
+    name: "".concat(signUpPrefix, "-state"),
+    placeholder: "Select a state",
+    validate: function validate(val) {
+      return !!val;
+    },
+    error: "Required"
+  },
+  postalCode: {
+    label: "Postal Code",
+    name: "".concat(signUpPrefix, "-postalCode"),
+    placeholder: "Postal Code",
+    validate: function validate(val) {
+      return !!val;
+    },
+    error: "Required"
   }
 };
 
@@ -206432,8 +207498,7 @@ var BillingContainer = function BillingContainer() {
       newMembers = _ref.newMembers,
       subscribedMembers = _ref.subscribedMembers,
       pastDueInvoices = _ref.pastDueInvoices,
-      refundsPending = _ref.refundsPending; // TODO: this any can be removed when newMembers spelling is fixed in api client
-
+      refundsPending = _ref.refundsPending;
 
   var fallbackUI = isRequesting && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_10__["default"], {
     id: "plans-loading",
@@ -206743,6 +207808,10 @@ function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterat
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -206792,7 +207861,8 @@ var defaultState = {
   type: app_entities_invoice__WEBPACK_IMPORTED_MODULE_11__["InvoiceableResource"].Membership,
   planId: "",
   planMatchError: "",
-  disableOption: false
+  disableOption: false,
+  isPromotion: false
 };
 var BillingFormComponent =
 /*#__PURE__*/
@@ -206902,9 +207972,15 @@ function (_React$Component) {
       };
     }());
 
-    _defineProperty(_assertThisInitialized(_this), "toggleDisableOption", function (_event, checked) {
+    _defineProperty(_assertThisInitialized(_this), "toggleDisableOption", function (event) {
       return _this.setState({
-        disableOption: checked
+        disableOption: event.currentTarget.checked
+      });
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "togglePromotionOption", function (event) {
+      return _this.setState({
+        isPromotion: event.currentTarget.checked
       });
     });
 
@@ -206971,7 +208047,7 @@ function (_React$Component) {
       });
     });
 
-    _this.state = defaultState;
+    _this.state = _objectSpread({}, defaultState);
     return _this;
   }
 
@@ -206997,11 +208073,14 @@ function (_React$Component) {
       var oldOptionType = oldOption && oldOption.resourceClass; // Reset on form open
 
       if (isOpen && !wasOpen) {
-        this.setState(defaultState);
+        this.setState({
+          planMatchError: ""
+        });
 
         if (option) {
           this.setState({
-            disableOption: option.disabled
+            disableOption: option.disabled,
+            isPromotion: option.isPromotion
           });
         }
       } // Reload plans if type changes
@@ -207038,7 +208117,9 @@ function (_React$Component) {
       var _this$state2 = this.state,
           type = _this$state2.type,
           planId = _this$state2.planId,
-          disableOption = _this$state2.disableOption; // TODO: The validation / when things are disabled doesn't make a lot of sense
+          disableOption = _this$state2.disableOption,
+          isPromotion = _this$state2.isPromotion;
+      console.error("type", type); // TODO: The validation / when things are disabled doesn't make a lot of sense
       // Need to work out how selecting discounts & plans will relate to fields
 
       return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_FormModal__WEBPACK_IMPORTED_MODULE_10__["default"], {
@@ -207156,6 +208237,19 @@ function (_React$Component) {
           color: "default"
         }),
         label: ui_billing_constants__WEBPACK_IMPORTED_MODULE_13__["fields"].disabled.label
+      })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
+        item: true,
+        xs: 12
+      }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_3___default.a, {
+        control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_9___default.a, {
+          name: ui_billing_constants__WEBPACK_IMPORTED_MODULE_13__["fields"].isPromotion.name,
+          value: ui_billing_constants__WEBPACK_IMPORTED_MODULE_13__["fields"].isPromotion.name,
+          checked: isPromotion,
+          onChange: this.togglePromotionOption,
+          disabled: isRequesting,
+          color: "default"
+        }),
+        label: ui_billing_constants__WEBPACK_IMPORTED_MODULE_13__["fields"].isPromotion.label
       }))));
     }
   }]);
@@ -207389,6 +208483,18 @@ var fields = [{
       color: ui_constants__WEBPACK_IMPORTED_MODULE_13__["Status"].Success
     });
   }
+}, {
+  id: "isPromotion",
+  label: "Promotion",
+  cell: function cell(row) {
+    return row.isPromotion ? react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_StatusLabel__WEBPACK_IMPORTED_MODULE_12__["default"], {
+      label: "",
+      color: ui_constants__WEBPACK_IMPORTED_MODULE_13__["Status"].Primary
+    }) : react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_StatusLabel__WEBPACK_IMPORTED_MODULE_12__["default"], {
+      label: "",
+      color: ui_constants__WEBPACK_IMPORTED_MODULE_13__["Status"].Info
+    });
+  }
 }];
 
 var OptionsList =
@@ -208444,6 +209550,12 @@ var fields = (_fields = {}, _defineProperty(_fields, app_entities_invoice__WEBPA
   transform: function transform(val) {
     return !!val;
   }
+}), _defineProperty(_fields, app_entities_invoice__WEBPACK_IMPORTED_MODULE_0__["Properties"].IsPromotion, {
+  label: "Mark as a Promotion. This will list it at the top, separate of other options in the billing  menu",
+  name: "".concat(formPrefix, "-promotion"),
+  transform: function transform(val) {
+    return !!val;
+  }
 }), _fields);
 
 /***/ }),
@@ -210804,38 +211916,31 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var lodash_es_capitalize__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! lodash-es/capitalize */ "./node_modules/lodash-es/capitalize.js");
-/* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @material-ui/core/Grid */ "./node_modules/@material-ui/core/Grid/index.js");
-/* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @material-ui/core/Typography */ "./node_modules/@material-ui/core/Typography/index.js");
-/* harmony import */ var _material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _material_ui_core_Tabs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @material-ui/core/Tabs */ "./node_modules/@material-ui/core/Tabs/index.js");
-/* harmony import */ var _material_ui_core_Tabs__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Tabs__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var _material_ui_core_Tab__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/core/Tab */ "./node_modules/@material-ui/core/Tab/index.js");
-/* harmony import */ var _material_ui_core_Tab__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Tab__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var ui_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ui/common/LoadingOverlay */ "./src/ui/common/LoadingOverlay.tsx");
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
+/* harmony import */ var use_react_router__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! use-react-router */ "./node_modules/use-react-router/use-react-router.js");
+/* harmony import */ var use_react_router__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(use_react_router__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @material-ui/core/Grid */ "./node_modules/@material-ui/core/Grid/index.js");
+/* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @material-ui/core/Typography */ "./node_modules/@material-ui/core/Typography/index.js");
+/* harmony import */ var _material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _material_ui_core_Tabs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/core/Tabs */ "./node_modules/@material-ui/core/Tabs/index.js");
+/* harmony import */ var _material_ui_core_Tabs__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Tabs__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var _material_ui_core_Tab__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @material-ui/core/Tab */ "./node_modules/@material-ui/core/Tab/index.js");
+/* harmony import */ var _material_ui_core_Tab__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Tab__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var ui_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ui/common/LoadingOverlay */ "./src/ui/common/LoadingOverlay.tsx");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
 
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _iterableToArrayLimit(arr, i) { if (!(Symbol.iterator in Object(arr) || Object.prototype.toString.call(arr) === "[object Arguments]")) { return; } var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 
 
@@ -210849,125 +211954,215 @@ var sectionBorderStyle = {
   borderRadius: "3px"
 };
 
-var DetailView =
-/*#__PURE__*/
-function (_React$Component) {
-  _inherits(DetailView, _React$Component);
+var DetailView = function DetailView(_ref) {
+  var activeResourceName = _ref.activeResourceName,
+      resources = _ref.resources,
+      title = _ref.title,
+      actionButtons = _ref.actionButtons,
+      information = _ref.information;
+  var resourcesExist = Array.isArray(resources) && !!resources.length;
 
-  function DetailView(props) {
-    var _this;
+  var _React$useState = react__WEBPACK_IMPORTED_MODULE_0__["useState"](resourcesExist ? resources[0] : undefined),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      activeResource = _React$useState2[0],
+      setActiveResource = _React$useState2[1];
 
-    _classCallCheck(this, DetailView);
+  var _useReactRouter = use_react_router__WEBPACK_IMPORTED_MODULE_2___default()(),
+      resource = _useReactRouter.match.params.resource,
+      history = _useReactRouter.history,
+      pathname = _useReactRouter.location.pathname;
 
-    _this = _possibleConstructorReturn(this, _getPrototypeOf(DetailView).call(this, props));
+  react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](function () {
+    resource && changeResource(resource);
+  }, [resource]);
+  var changeResource = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](function (newActiveName) {
+    var resourceLookupName = newActiveName || activeResourceName;
+
+    if (resourcesExist) {
+      var newResource = resourceLookupName && resources.find(function (resource) {
+        return resource.name === resourceLookupName;
+      }) || resources[0];
+
+      if (newResource) {
+        setActiveResource(newResource);
+
+        if (resource !== newResource.name) {
+          var hasSubpath = resources.some(function (resource) {
+            return pathname.endsWith("/".concat(resource.name));
+          });
+          var newPath = hasSubpath ? pathname.replace(/\/[^\/]*$/, "/".concat(newResource.name)) : "".concat(pathname, "/").concat(newResource.name);
+          history.push(newPath);
+        }
+      }
+    }
+  }, [activeResourceName, resources]);
+  var onTabChange = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](function (_, value) {
+    changeResource(value);
+  }, [changeResource]);
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_3___default.a, {
+    container: true,
+    spacing: 24,
+    justify: "center"
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_3___default.a, {
+    item: true,
+    md: 10,
+    xs: 12
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_4___default.a, {
+    id: "detail-view-title",
+    gutterBottom: true,
+    variant: "h6"
+  }, title), actionButtons), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_3___default.a, {
+    item: true,
+    md: 10,
+    xs: 12,
+    style: sectionBorderStyle
+  }, information), resourcesExist && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_3___default.a, {
+    item: true,
+    md: 10,
+    xs: 12,
+    style: _objectSpread({}, sectionBorderStyle, {
+      marginTop: "0.5em"
+    })
+  }, activeResource && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, resources.length > 1 && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Tabs__WEBPACK_IMPORTED_MODULE_5___default.a, {
+    value: activeResource.name,
+    indicatorColor: "primary",
+    textColor: "primary",
+    style: {
+      marginBottom: "1em"
+    },
+    onChange: onTabChange
+  }, resources.map(function (resource) {
+    return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Tab__WEBPACK_IMPORTED_MODULE_6___default.a, {
+      id: "".concat(resource.name, "-tab"),
+      label: resource.displayName || Object(lodash_es_capitalize__WEBPACK_IMPORTED_MODULE_1__["default"])(resource.name),
+      value: resource.name,
+      key: resource.name
+    });
+  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", {
+    style: _objectSpread({}, resources.length > 1 && {
+      marginTop: "0.5em"
+    })
+  }, activeResource.content)) || react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_7__["default"], {
+    id: "detail-view"
+  })));
+};
 
-    _defineProperty(_assertThisInitialized(_this), "setActiveResourceFromProps", function (newActiveName) {
-      var _this$props = _this.props,
-          activeResourceName = _this$props.activeResourceName,
-          resources = _this$props.resources;
-      var resourceLookupName = newActiveName || activeResourceName;
+/* harmony default export */ __webpack_exports__["default"] = (DetailView);
 
-      if (_this.resourcesExist()) {
-        var activeResource = resourceLookupName && resources.find(function (resource) {
-          return resource.name === resourceLookupName;
-        }) || resources[0];
+/***/ }),
+
+/***/ "./src/ui/common/ErrorBoundary.tsx":
+/*!*****************************************!*\
+  !*** ./src/ui/common/ErrorBoundary.tsx ***!
+  \*****************************************/
+/*! exports provided: default */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @material-ui/core/Grid */ "./node_modules/@material-ui/core/Grid/index.js");
+/* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _material_ui_icons_Error__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @material-ui/icons/Error */ "./node_modules/@material-ui/icons/Error.js");
+/* harmony import */ var _material_ui_icons_Error__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_material_ui_icons_Error__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! makerspace-ts-api-client */ "./node_modules/makerspace-ts-api-client/dist/apiClient.js");
+/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../hooks/useWriteTransaction */ "./src/ui/hooks/useWriteTransaction.ts");
+/* harmony import */ var _material_ui_core__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/index.es.js");
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-        _this.setState({
-          activeResource: activeResource
-        });
-      }
-    });
 
-    _defineProperty(_assertThisInitialized(_this), "resourcesExist", function () {
-      var resources = _this.props.resources;
-      return Array.isArray(resources) && resources.length;
-    });
 
-    _defineProperty(_assertThisInitialized(_this), "renderInformation", function () {
-      var _this$props2 = _this.props,
-          information = _this$props2.information,
-          title = _this$props2.title,
-          actionButtons = _this$props2.actionButtons;
-      return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
-        item: true,
-        md: 10,
-        xs: 12
-      }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_3___default.a, {
-        id: "detail-view-title",
-        gutterBottom: true,
-        variant: "h6"
-      }, title), actionButtons), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
-        item: true,
-        md: 10,
-        xs: 12,
-        style: sectionBorderStyle
-      }, information));
-    });
 
-    _defineProperty(_assertThisInitialized(_this), "changeResource", function (_event, value) {
-      _this.setActiveResourceFromProps(value);
-    });
 
-    _defineProperty(_assertThisInitialized(_this), "renderResources", function () {
-      var activeResource = _this.state.activeResource;
-      var resources = _this.props.resources;
-      return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
-        item: true,
-        md: 10,
-        xs: 12,
-        style: _objectSpread({}, sectionBorderStyle, {
-          marginTop: "0.5em"
-        })
-      }, activeResource && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, resources.length > 1 && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Tabs__WEBPACK_IMPORTED_MODULE_4___default.a, {
-        value: activeResource.name,
-        indicatorColor: "primary",
-        textColor: "primary",
-        style: {
-          marginBottom: "1em"
-        },
-        onChange: _this.changeResource
-      }, resources.map(function (resource) {
-        return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Tab__WEBPACK_IMPORTED_MODULE_5___default.a, {
-          id: "".concat(resource.name, "-tab"),
-          label: resource.displayName || Object(lodash_es_capitalize__WEBPACK_IMPORTED_MODULE_1__["default"])(resource.name),
-          value: resource.name,
-          key: resource.name
-        });
-      })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", {
-        style: _objectSpread({}, resources.length > 1 && {
-          marginTop: "0.5em"
-        })
-      }, activeResource.content)) || react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_6__["default"], {
-        id: "detail-view"
-      }));
-    });
 
+
+
+var ErrorBoundaryInternal =
+/*#__PURE__*/
+function (_React$Component) {
+  _inherits(ErrorBoundaryInternal, _React$Component);
+
+  function ErrorBoundaryInternal(props) {
+    var _this;
+
+    _classCallCheck(this, ErrorBoundaryInternal);
+
+    _this = _possibleConstructorReturn(this, _getPrototypeOf(ErrorBoundaryInternal).call(this, props));
     _this.state = {
-      activeResource: undefined
+      hasError: false
     };
     return _this;
   }
 
-  _createClass(DetailView, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      this.setActiveResourceFromProps();
+  _createClass(ErrorBoundaryInternal, [{
+    key: "componentDidCatch",
+    value: function componentDidCatch(error) {
+      this.setState({
+        hasError: true
+      });
+      this.props.reportError(error.toString());
     }
   }, {
     key: "render",
     value: function render() {
-      return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
-        container: true,
-        spacing: 24,
-        justify: "center"
-      }, this.renderInformation(), this.resourcesExist() && this.renderResources());
+      if (this.state.hasError) {
+        return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1___default.a, {
+          container: true,
+          direction: "row",
+          justify: "center",
+          alignItems: "center"
+        }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_icons_Error__WEBPACK_IMPORTED_MODULE_2___default.a, {
+          fontSize: "large",
+          color: "error"
+        }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core__WEBPACK_IMPORTED_MODULE_5__["Typography"], {
+          color: "error"
+        }, "An unexpected error has occured. Please refresh the page and try again."));
+      }
+
+      return this.props.children;
     }
   }]);
 
-  return DetailView;
+  return ErrorBoundaryInternal;
 }(react__WEBPACK_IMPORTED_MODULE_0__["Component"]);
 
-/* harmony default export */ __webpack_exports__["default"] = (DetailView);
+var ErrorBoundary = function ErrorBoundary(_ref) {
+  var children = _ref.children;
+
+  var _useWriteTransaction = Object(_hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_4__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["message"]),
+      call = _useWriteTransaction.call;
+
+  var reportError = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](function (err) {
+    call({
+      messageDetails: {
+        message: err
+      }
+    });
+  }, [call]);
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ErrorBoundaryInternal, {
+    reportError: reportError
+  }, children);
+};
+
+/* harmony default export */ __webpack_exports__["default"] = (ErrorBoundary);
 
 /***/ }),
 
@@ -212749,11 +213944,13 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 var statusToStyleMap = (_statusToStyleMap = {}, _defineProperty(_statusToStyleMap, ui_constants__WEBPACK_IMPORTED_MODULE_1__["Status"].Danger, {
-  backgroundColor: "rgba(255, 0, 0, 0.4)"
+  backgroundColor: "rgba(255, 0, 0, 1)"
 }), _defineProperty(_statusToStyleMap, ui_constants__WEBPACK_IMPORTED_MODULE_1__["Status"].Success, {
-  backgroundColor: "rgba(88, 227, 111, 0.4)"
+  backgroundColor: "rgba(88, 227, 111, 1)"
 }), _defineProperty(_statusToStyleMap, ui_constants__WEBPACK_IMPORTED_MODULE_1__["Status"].Info, {
   backgroundColor: "rgba(0, 0, 0, 0.12)"
+}), _defineProperty(_statusToStyleMap, ui_constants__WEBPACK_IMPORTED_MODULE_1__["Status"].Primary, {
+  backgroundColor: "rgba(33, 150, 243, 1)"
 }), _statusToStyleMap);
 var circleStyle = {
   height: "1em",
@@ -213270,7 +214467,10 @@ function (_React$Component) {
         placeholder: "Search...",
         onKeyPress: this.onSearchEnter
       })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", {
-        className: "table-wrapper"
+        className: "table-wrapper",
+        style: {
+          overflowX: "auto"
+        }
       }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_table_Table__WEBPACK_IMPORTED_MODULE_5__["default"], {
         id: id,
         page: pageNum,
@@ -213349,6 +214549,7 @@ var Status;
   Status["Info"] = "info";
   Status["Warn"] = "warn";
   Status["Default"] = "default";
+  Status["Primary"] = "primary";
 })(Status || (Status = {}));
 
 var ItemsPerPage;
@@ -217361,6 +218562,16 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _hooks_useModal__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../hooks/useModal */ "./src/ui/hooks/useModal.ts");
 /* harmony import */ var _reducer_hooks__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../reducer/hooks */ "./src/ui/reducer/hooks.ts");
 /* harmony import */ var _MemberForm__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./MemberForm */ "./src/ui/member/MemberForm.tsx");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -217402,7 +218613,7 @@ var CreateMember = function CreateMember(_ref) {
     var _ref3 = _asyncToGenerator(
     /*#__PURE__*/
     regeneratorRuntime.mark(function _callee(form) {
-      var validUpdate;
+      var validUpdate, street, unit, city, state, postalCode, rest;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -217421,11 +218632,20 @@ var CreateMember = function CreateMember(_ref) {
               return _context.abrupt("return");
 
             case 5:
+              street = validUpdate.street, unit = validUpdate.unit, city = validUpdate.city, state = validUpdate.state, postalCode = validUpdate.postalCode, rest = _objectWithoutProperties(validUpdate, ["street", "unit", "city", "state", "postalCode"]);
               create({
-                createMemberDetails: validUpdate
+                createMemberDetails: _objectSpread({}, rest, {
+                  address: {
+                    street: street,
+                    unit: unit,
+                    city: city,
+                    state: state,
+                    postalCode: postalCode
+                  }
+                })
               });
 
-            case 6:
+            case 7:
             case "end":
               return _context.stop();
           }
@@ -217478,6 +218698,16 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _hooks_useModal__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../hooks/useModal */ "./src/ui/hooks/useModal.ts");
 /* harmony import */ var _reducer_hooks__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../reducer/hooks */ "./src/ui/reducer/hooks.ts");
 /* harmony import */ var _MemberForm__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./MemberForm */ "./src/ui/member/MemberForm.tsx");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -217524,7 +218754,7 @@ var EditMember = function EditMember(_ref) {
     var _ref2 = _asyncToGenerator(
     /*#__PURE__*/
     regeneratorRuntime.mark(function _callee(form) {
-      var validUpdate;
+      var validUpdate, street, unit, city, state, postalCode, rest;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -217543,12 +218773,21 @@ var EditMember = function EditMember(_ref) {
               return _context.abrupt("return");
 
             case 5:
+              street = validUpdate.street, unit = validUpdate.unit, city = validUpdate.city, state = validUpdate.state, postalCode = validUpdate.postalCode, rest = _objectWithoutProperties(validUpdate, ["street", "unit", "city", "state", "postalCode"]);
               update({
                 id: member.id,
-                updateMemberDetails: validUpdate
+                updateMemberDetails: _objectSpread({}, rest, {
+                  address: {
+                    street: street,
+                    unit: unit,
+                    city: city,
+                    state: state,
+                    postalCode: postalCode
+                  }
+                })
               });
 
-            case 6:
+            case 7:
             case "end":
               return _context.stop();
           }
@@ -217865,6 +219104,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var ui_common_Form__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ui/common/Form */ "./src/ui/common/Form.tsx");
 /* harmony import */ var ui_utils_timeToDate__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ui/utils/timeToDate */ "./src/ui/utils/timeToDate.ts");
 /* harmony import */ var _MemberStatusLabel__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./MemberStatusLabel */ "./src/ui/member/MemberStatusLabel.tsx");
+/* harmony import */ var _states__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./states */ "./src/ui/member/states.ts");
 function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -217913,6 +219153,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 
+
 var MemberForm =
 /*#__PURE__*/
 function (_React$Component) {
@@ -218015,6 +219256,85 @@ function (_React$Component) {
         id: fields.email.name,
         placeholder: fields.email.placeholder,
         type: "email"
+      })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
+        item: true,
+        xs: 12
+      }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_3___default.a, {
+        fullWidth: true,
+        value: member.phone,
+        label: fields.phone.label,
+        name: fields.phone.name,
+        id: fields.phone.name,
+        placeholder: fields.phone.placeholder,
+        type: "phone"
+      })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
+        item: true,
+        xs: 12
+      }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_3___default.a, {
+        fullWidth: true,
+        required: true,
+        value: member.address && member.address.street,
+        label: fields.street.label,
+        name: fields.street.name,
+        id: fields.street.name,
+        placeholder: fields.street.placeholder
+      })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
+        item: true,
+        xs: 12
+      }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_3___default.a, {
+        fullWidth: true,
+        value: member.address && member.address.unit,
+        label: fields.unit.label,
+        name: fields.unit.name,
+        id: fields.unit.name,
+        placeholder: fields.unit.placeholder
+      })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
+        item: true,
+        sm: 12,
+        md: 5
+      }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_3___default.a, {
+        fullWidth: true,
+        required: true,
+        value: member.address && member.address.city,
+        label: fields.city.label,
+        name: fields.city.name,
+        id: fields.city.name,
+        placeholder: fields.city.placeholder
+      })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
+        item: true,
+        sm: 6,
+        md: 4
+      }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormLabel__WEBPACK_IMPORTED_MODULE_5___default.a, {
+        component: "legend"
+      }, fields.state.label), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Select__WEBPACK_IMPORTED_MODULE_4___default.a, {
+        name: fields.state.name,
+        value: member.address && member.address.state,
+        fullWidth: true,
+        "native": true,
+        required: true,
+        placeholder: fields.state.placeholder
+      }, [react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("option", {
+        id: "".concat(fields.state.name, "-option-none"),
+        key: "none",
+        value: ""
+      }, fields.state.placeholder)].concat(Object.keys(_states__WEBPACK_IMPORTED_MODULE_13__["states"]).map(function (key) {
+        return react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("option", {
+          id: "".concat(fields.state.name, "-option-").concat(Object(lodash_es_kebabCase__WEBPACK_IMPORTED_MODULE_1__["default"])(key)),
+          key: Object(lodash_es_kebabCase__WEBPACK_IMPORTED_MODULE_1__["default"])(key),
+          value: key
+        }, key);
+      })))), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
+        item: true,
+        sm: 6,
+        md: 3
+      }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_3___default.a, {
+        fullWidth: true,
+        required: true,
+        value: member.address && member.address.postalCode,
+        label: fields.postalCode.label,
+        name: fields.postalCode.name,
+        id: fields.postalCode.name,
+        placeholder: fields.postalCode.placeholder
       })), isAdmin && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, fields.expirationTime && // Dont display expiration for creation
       react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
         item: true,
@@ -218652,7 +219972,7 @@ var fields = function fields(admin, member) {
       validate: function validate(val) {
         return !!val;
       },
-      error: "Invalid name"
+      error: "Required"
     },
     lastname: {
       label: "Last Name",
@@ -218661,7 +219981,7 @@ var fields = function fields(admin, member) {
       validate: function validate(val) {
         return !!val;
       },
-      error: "Invalid name"
+      error: "Required"
     },
     email: {
       label: "Email / Username",
@@ -218670,7 +219990,51 @@ var fields = function fields(admin, member) {
       validate: function validate(val) {
         return val && Object(app_utils__WEBPACK_IMPORTED_MODULE_0__["emailValid"])(val);
       },
-      error: "Invalid email"
+      error: "Required"
+    },
+    phone: {
+      label: "Phone Number",
+      name: "".concat(formPrefix, "-phone")
+    },
+    street: {
+      label: "Street Address",
+      name: "".concat(formPrefix, "-street"),
+      placeholder: "Enter street address",
+      validate: function validate(val) {
+        return member && member.id ? true : !!val;
+      },
+      error: "Required"
+    },
+    unit: {
+      label: "Unit or Apt #",
+      name: "".concat(formPrefix, "-unit")
+    },
+    city: {
+      label: "City",
+      name: "".concat(formPrefix, "-city"),
+      placeholder: "Enter city",
+      validate: function validate(val) {
+        return member && member.id ? true : !!val;
+      },
+      error: "Required"
+    },
+    state: {
+      label: "State",
+      name: "".concat(formPrefix, "-state"),
+      placeholder: "Select a state",
+      validate: function validate(val) {
+        return member && member.id ? true : !!val;
+      },
+      error: "Required"
+    },
+    postalCode: {
+      label: "Postal Code",
+      name: "".concat(formPrefix, "-postalCode"),
+      placeholder: "Postal Code",
+      validate: function validate(val) {
+        return member && member.id ? true : !!val;
+      },
+      error: "Required"
     }
   }, admin && _objectSpread({
     status: {
@@ -218776,6 +220140,80 @@ var getDetailsForMember = function getDetailsForMember(member) {
 
 /***/ }),
 
+/***/ "./src/ui/member/states.ts":
+/*!*********************************!*\
+  !*** ./src/ui/member/states.ts ***!
+  \*********************************/
+/*! exports provided: states */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "states", function() { return states; });
+var states = {
+  "AL": "Alabama",
+  "AK": "Alaska",
+  "AS": "American Samoa",
+  "AZ": "Arizona",
+  "AR": "Arkansas",
+  "CA": "California",
+  "CO": "Colorado",
+  "CT": "Connecticut",
+  "DE": "Delaware",
+  "DC": "District Of Columbia",
+  "FM": "Federated States Of Micronesia",
+  "FL": "Florida",
+  "GA": "Georgia",
+  "GU": "Guam",
+  "HI": "Hawaii",
+  "ID": "Idaho",
+  "IL": "Illinois",
+  "IN": "Indiana",
+  "IA": "Iowa",
+  "KS": "Kansas",
+  "KY": "Kentucky",
+  "LA": "Louisiana",
+  "ME": "Maine",
+  "MH": "Marshall Islands",
+  "MD": "Maryland",
+  "MA": "Massachusetts",
+  "MI": "Michigan",
+  "MN": "Minnesota",
+  "MS": "Mississippi",
+  "MO": "Missouri",
+  "MT": "Montana",
+  "NE": "Nebraska",
+  "NV": "Nevada",
+  "NH": "New Hampshire",
+  "NJ": "New Jersey",
+  "NM": "New Mexico",
+  "NY": "New York",
+  "NC": "North Carolina",
+  "ND": "North Dakota",
+  "MP": "Northern Mariana Islands",
+  "OH": "Ohio",
+  "OK": "Oklahoma",
+  "OR": "Oregon",
+  "PW": "Palau",
+  "PA": "Pennsylvania",
+  "PR": "Puerto Rico",
+  "RI": "Rhode Island",
+  "SC": "South Carolina",
+  "SD": "South Dakota",
+  "TN": "Tennessee",
+  "TX": "Texas",
+  "UT": "Utah",
+  "VT": "Vermont",
+  "VI": "Virgin Islands",
+  "VA": "Virginia",
+  "WA": "Washington",
+  "WV": "West Virginia",
+  "WI": "Wisconsin",
+  "WY": "Wyoming"
+};
+
+/***/ }),
+
 /***/ "./src/ui/member/utils.ts":
 /*!********************************!*\
   !*** ./src/ui/member/utils.ts ***!
@@ -219113,6 +220551,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _DuplicateInvoiceModal__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./DuplicateInvoiceModal */ "./src/ui/membership/DuplicateInvoiceModal.tsx");
 function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
+
+function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
@@ -219177,8 +220623,9 @@ var MembershipSelect = function MembershipSelect(_ref) {
       _useReadTransaction$d = _useReadTransaction.data,
       options = _useReadTransaction$d === void 0 ? [] : _useReadTransaction$d;
 
-  var allOptions = react__WEBPACK_IMPORTED_MODULE_0__["useMemo"](function () {
-    return options.sort(byAmount).concat(allowNone ? [{
+  var _React$useMemo2 = react__WEBPACK_IMPORTED_MODULE_0__["useMemo"](function () {
+    var promotionOptions = [];
+    var trailingOptions = allowNone ? [{
       id: "none",
       name: "None",
       description: "Paid with cash or select an option later",
@@ -219186,9 +220633,27 @@ var MembershipSelect = function MembershipSelect(_ref) {
       resourceClass: undefined,
       quantity: 0,
       disabled: false,
-      operation: undefined
-    }] : []);
-  }, [allowNone, options]); // Select bookmarked option on load
+      operation: undefined,
+      isPromotion: false
+    }] : [];
+    var normalOptions = options.reduce(function (opts, option) {
+      if (option.isPromotion) {
+        promotionOptions.push(option);
+      } else {
+        opts.push(option);
+      }
+
+      return opts;
+    }, []);
+    return [promotionOptions, [].concat(_toConsumableArray(normalOptions.sort(byAmount)), trailingOptions)];
+  }, [allowNone, options]),
+      _React$useMemo3 = _slicedToArray(_React$useMemo2, 2),
+      promotions = _React$useMemo3[0],
+      normalOptions = _React$useMemo3[1];
+
+  var allOptions = react__WEBPACK_IMPORTED_MODULE_0__["useMemo"](function () {
+    return normalOptions.concat(promotions);
+  }, [normalOptions, promotions]); // Select bookmarked option on load
 
   react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](function () {
     var option = (allOptions || []).find(function (option) {
@@ -219261,12 +220726,23 @@ var MembershipSelect = function MembershipSelect(_ref) {
   var normalizedError = error && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, "Error reading membership options: ", error, ". Email", " ", react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("a", {
     href: "mailto: contact@manchestermakerspace.org"
   }, "contact@manchestermakerspace.org"), " if your desired membership option is not present");
-  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_DuplicateInvoiceModal__WEBPACK_IMPORTED_MODULE_11__["default"], {
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, promotions && !!promotions.length && react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", {
+    className: "membership-promotion-options"
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_table_TableContainer__WEBPACK_IMPORTED_MODULE_8__["default"], {
+    id: "membership-promotion-select-table",
+    title: "Current Promotions",
+    data: promotions,
+    columns: fields,
+    rowId: function rowId(row) {
+      return row.id;
+    },
+    loading: isRequesting
+  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_DuplicateInvoiceModal__WEBPACK_IMPORTED_MODULE_11__["default"], {
     type: selectedOption && selectedOption.resourceClass
   }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_table_TableContainer__WEBPACK_IMPORTED_MODULE_8__["default"], {
     id: "membership-select-table",
-    title: _typeof(title) === undefined && "Select a Membership",
-    data: allOptions,
+    title: _typeof(title) === undefined && "Select a Membership" || promotions && !!promotions.length && "Standard Membership Options",
+    data: normalOptions,
     columns: fields,
     rowId: function rowId(row) {
       return row.id;
@@ -221789,6 +223265,7 @@ var CancelSubscriptionModal = function CancelSubscriptionModal(_ref) {
     });
   }, [call, subscriptionId]);
   var disableButton = !subscriptionId || subscription.status === "Canceled";
+  var whosSubscription = asAdmin ? subscription.memberName ? "".concat(subscription.memberName, "'s") : "this" : "your";
   return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_ButtonRow__WEBPACK_IMPORTED_MODULE_6__["ActionButton"], {
     id: "subscription-option-cancel",
     color: "secondary",
@@ -221808,7 +223285,7 @@ var CancelSubscriptionModal = function CancelSubscriptionModal(_ref) {
     error: error
   }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_1___default.a, {
     gutterBottom: true
-  }, "Are you sure you want to cancel your subscription?  This action cannot be undone."), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_SubscriptionDetails__WEBPACK_IMPORTED_MODULE_8__["SubscriptionDetailsInner"], {
+  }, "Are you sure you want to cancel ", whosSubscription, " subscription?  This action cannot be undone."), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_SubscriptionDetails__WEBPACK_IMPORTED_MODULE_8__["SubscriptionDetailsInner"], {
     subscription: subscription
   })));
 };
@@ -222962,14 +224439,6 @@ var TransactionFilters = function TransactionFilters(_ref) {
       params = _useQueryContext.params,
       setParam = _useQueryContext.setParam;
 
-  var onSearch = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](function (event) {
-    if (event.key === "Enter") {
-      var searchTerm = event.target.value;
-      setParam("search", searchTerm);
-      onChange();
-      close();
-    }
-  }, [setParam, onChange, close]);
   var setType = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](function (event) {
     setParam("type", event.target.value);
     onChange();
@@ -223043,21 +224512,6 @@ var TransactionFilters = function TransactionFilters(_ref) {
     component: "fieldset"
   }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormLabel__WEBPACK_IMPORTED_MODULE_4___default.a, {
     component: "legend"
-  }, "Search for transactions"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_7___default.a, {
-    id: "transaction-search-input",
-    type: "text",
-    placeholder: "Search...",
-    onKeyPress: onSearch
-  }))), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1___default.a, {
-    item: true,
-    xs: 12,
-    style: {
-      marginBottom: "1em"
-    }
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControl__WEBPACK_IMPORTED_MODULE_3___default.a, {
-    component: "fieldset"
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormLabel__WEBPACK_IMPORTED_MODULE_4___default.a, {
-    component: "legend"
   }, "Filter by Transaction Type"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_RadioGroup__WEBPACK_IMPORTED_MODULE_10___default.a, {
     name: "settled",
     value: params.type,
@@ -223313,7 +224767,6 @@ var TransactionsTable = function TransactionsTable(_ref) {
       isAdmin = _useAuthState.currentUser.isAdmin;
 
   var _useQueryContext = Object(_common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_11__["useQueryContext"])({
-    search: undefined,
     startDate: Object(ui_utils_timeToDate__WEBPACK_IMPORTED_MODULE_5__["dateToMidnight"])(moment__WEBPACK_IMPORTED_MODULE_1__().subtract(2, "months").valueOf()),
     endDate: Object(ui_utils_timeToDate__WEBPACK_IMPORTED_MODULE_5__["dateToMidnight"])(new Date()),
     type: undefined,