merge

src/components/notifications/Context/components/Static/index.js

@@ -49,26 +49,6 @@ export default (props: Props) => {
                     }
                 />
             );
-        } else if (location.state.send) {
-            notifications.push(
-                <Notification
-                    key="xrp-warning"
-                    type="warning"
-                    title="Do not send to accounts requiring a destination tag!"
-                    message={
-                        <>
-                            Destination tag is an arbitrary number which serves as a unique
-                            identifier of your transaction. Some services may require this to
-                            process your transaction. The current firmware version{' '}
-                            <strong>does not support</strong> destination tags yet.
-                            <br />
-                            <br />
-                            If the receiver requires a destination tag, do not use Trezor to send
-                            XRP. We are working on adding this feature.
-                        </>
-                    }
-                />
-            );
         }
     }
 

src/views/Wallet/views/Account/Send/ripple/components/AdvancedForm/index.js

@@ -82,16 +82,16 @@ const getFeeInputState = (feeErrors: string, feeWarnings: string): string => {
     return state;
 };
 
-// const getDestinationTagInputState = (errors: string, warnings: string): string => {
-//     let state = '';
-//     if (warnings && !errors) {
-//         state = 'warning';
-//     }
-//     if (errors) {
-//         state = 'error';
-//     }
-//     return state;
-// };
+const getDestinationTagInputState = (errors: string, warnings: string): string => {
+    let state = '';
+    if (warnings && !errors) {
+        state = 'warning';
+    }
+    if (errors) {
+        state = 'error';
+    }
+    return state;
+};
 
 const Left = styled.div`
     display: flex;
@@ -107,11 +107,11 @@ const AdvancedForm = (props: Props) => {
         warnings,
         infos,
         fee,
-        // destinationTag,
+        destinationTag,
     } = props.sendForm;
     const {
         onFeeChange,
-        // onDestinationTagChange,
+        onDestinationTagChange,
     } = props.sendFormActions;
 
     return (
@@ -150,7 +150,7 @@ const AdvancedForm = (props: Props) => {
                 />
             </InputRow>
 
-            {/* <InputRow>
+            <InputRow>
                 <StyledInput
                     state={getDestinationTagInputState(errors.destinationTag, warnings.destinationTag)}
                     autoComplete="off"
@@ -180,7 +180,7 @@ const AdvancedForm = (props: Props) => {
                     value={destinationTag}
                     onChange={event => onDestinationTagChange(event.target.value)}
                 />
-            </InputRow> */}
+            </InputRow>
 
             <AdvancedSettingsSendButtonWrapper>{props.children}</AdvancedSettingsSendButtonWrapper>
         </AdvancedSettingsWrapper>