@capillarytech/creatives-library 8.0.276 → 8.0.277

package/v2Containers/MobilePush/Edit/index.js

@@ -167,7 +167,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       };
       this.props.actions.getMobilepushTemplatesList('mobilepush', params);
     }
-    if (nextProps.metaEntities && nextProps.metaEntities.layouts && nextProps.metaEntities.layouts.length > 0 && _.isEmpty(this.state.fullSchema)) {
+    if (nextProps.metaEntities && nextProps.metaEntities.layouts && nextProps.metaEntities.layouts.length > 0 && _.isEmpty(this.state.fullSchema) && _.isEmpty(this.state.formData)) {
       this.setState({fullSchema: nextProps.metaEntities.layouts[0].definition, schema: (nextProps.location.query.module === 'loyalty') ? nextProps.metaEntities.layouts[0].definition.textSchema : {}}, () => {
         this.handleEditSchemaOnPropsChange(nextProps, selectedWeChatAccount);
         const templateId = get(this, "props.params.id");
@@ -388,11 +388,11 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
         }
       });
     } else {
-      selectedAccount = accounts[0];
+      selectedAccount = accounts?.length > 0 ? accounts[0] : {};
       formData['mobilepush-accounts'] = selectedAccount?.id;
     }
     this.props.actions.setWeChatAccount(selectedAccount);
-    this.setState({formData, accountsOptions: accounts.map((acc) => ({key: acc.id, label: acc.name, value: acc.id}))});
+    this.setState({formData, accountsOptions: accounts?.length > 0 ? accounts.map((acc) => ({key: acc.id, label: acc.name, value: acc.id})) : []});
   };
 
   createDefinition = (account) => ({
@@ -2023,7 +2023,8 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
         <CapSpin spinning={spinning}>
           <CapRow>
             <CapColumn>
-              {!this.props.isLoadingMetaEntities && <FormBuilder
+              <FormBuilder
+                key={!_.isEmpty(schema) ? 'has-schema' : 'no-schema'}
                 channel={MOBILE_PUSH}
                 schema={schema}
                 showLiquidErrorInFooter={this.props.showLiquidErrorInFooter}
@@ -2058,7 +2059,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
                 hideTestAndPreviewBtn={this.props.hideTestAndPreviewBtn}
                 isFullMode={this.props.isFullMode}
                 eventContextTags={this.props?.eventContextTags}
-              />}
+              />
             </CapColumn>
             {this.props.iosCtasData && this.state.showIosCtaTable &&
               <CapSlideBox

package/v2Containers/SmsTrai/Create/index.scss

@@ -98,5 +98,5 @@
 }
 
 .create-dlt-msg {
-  margin-left: 120px;
+  margin-left: 170px;
 }

package/v2Containers/SmsTrai/Edit/index.js

@@ -106,7 +106,6 @@ export const SmsTraiEdit = (props) => {
     padding: ${CAP_SPACE_32} ${CAP_SPACE_24};
     position: fixed;
     bottom: 2rem;
-    margin-left: -2rem;
     .ant-btn {
       margin-right: ${CAP_SPACE_16};
     }
@@ -688,17 +687,24 @@ export const SmsTraiEdit = (props) => {
           <CapButton
             onClick={handleTestAndPreview}
             type="secondary"
-            className="create-msg create-dlt-msg"
+            className="create-msg"
           >
             <FormattedMessage {...messages.testAndPreviewButtonLabel} />
           </CapButton>
           <CapButton
             onClick={isLiquidSupportFeatureEnabled ? onSubmitWrapper : onDoneCallback}
-            className="create-msg"
+            className="create-msg create-dlt-msg"
             disabled={isTagValidationError || (isLiquidSupportFeatureEnabled && !isObject(metaEntities?.tagLookupMap))}
           >
             <FormattedMessage {...messages.saveButtonLabel} />
           </CapButton>
+          <CapButton
+            onClick={handleClose}
+            className="cancel-dlt-msg"
+            type="secondary"
+          >
+            <FormattedMessage {...messages.cancelButtonLabel} />
+          </CapButton>
         </SMSTraiFooter>
         <TestAndPreviewSlidebox
           show={showTestAndPreviewSlidebox}